| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-07 |
| |\ | |||
| | * | Merge pull request #99 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-03-06 |
| | |\ | | | | | | | File IO Updates | ||
| | | * | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-06 |
| | | |\ | |||
| | | | * | Adding CDN support for URLs in linked CSS | Jose Antonio Marquez | 2012-03-06 |
| | | | | | |||
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-06 |
| | | | |\ | | |_|/ | |/| | | | | | | | | | | Conflicts: js/controllers/selection-controller.js | ||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-06 |
| | |\ \ \ | |||
| | * | | | | Squashed commit FileIO-Build-Candidate into Master | Valerio Virgillito | 2012-03-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | Fixing WebGL not available bug | Jose Antonio Marquez | 2012-03-06 |
| | | | | | | |||
| | | | | * | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-06 |
| | | | | |\ | |||
| | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-06 |
| | | | |\| | | |||
| | | | | * | | Changing length of characters per line (pretty function) | Jose Antonio Marquez | 2012-03-06 |
| | | | | | | | |||
| | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | | |\| | | |||
| | | | | * | | CSS on CDN preview fix | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | |||
| | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | | |\| | | |||
| | | | | * | | Temp support for CDN CSS | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Added a temp fix for allow the viewing of CSS on a CDN, however, the styles should not be editable, but will allow for accurate preview of styles. Need to coordinate with the CSS panel and styles manager to insert styles in the appropriate files or tags that have write permission. | ||
| | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | | |\| | | |||
| | | | | * | | Minor Fix | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to comment out the return, therefore preventing to save. | ||
| | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | | |\| | | |||
| | | | | * | | Fixed URL parsing issue on actual opened document | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Still need to implement CSS loaded from a CDN, currently this would break Ninja. | ||
| | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | | |\| | | |||
| | | | | * | | Resolved URL path issues in document and CSS | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to allow for files opened and assets linked in any order all under the cloud server root. | ||
| | | | | * | | Setting up document level URL parsing | Jose Antonio Marquez | 2012-03-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Set up logic to parse URLs document level (href, src, url) still need to add functionality to return proper value, currently only detecting current value. | ||
| | | | | * | | Improved CSS URL cleaned | Jose Antonio Marquez | 2012-03-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to accommodate any URLs in a CSS file inside the opened document root. Need to add logic for handling linked references above the root. Also need to reformat into a reusable method as it might be needed besides CSS. | ||
| | | | | * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-02 |
| | | | | |\ \ | |||
| | | | * | \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-02 |
| | | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||
| | | | * | | | | Formatting fixes | Jose Antonio Marquez | 2012-03-02 |
| | | | | |/ / | | | |/| | | |||
| | | | * | | | Minor logic fixes for URL resolution in CSS | Jose Antonio Marquez | 2012-03-02 |
| | | | | | | | |||
| | | | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-02 |
| | | | |\ \ \ | |||
| | | | * | | | | Fixing CSS URL issues | Jose Antonio Marquez | 2012-03-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only partially, supporting unquoted files under same root. | ||
| | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-02 |
| | | | |\ \ \ \ | |||
| | | | * | | | | | Fixing IO RegEx | Jose Antonio Marquez | 2012-03-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed parsing files to have correct URLs with RegEx, inner content of CSS files still needs to be fixed. | ||
| | | | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-01 |
| | | | |\ \ \ \ \ | |||
| | | | * | | | | | | Optimizing URL intercepting detection | Jose Antonio Marquez | 2012-03-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the way the webRequest maps to the file. | ||
| | | | * | | | | | | Merge pull request #24 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-29 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | undo/redo per document , codemirror 2.22 update | ||
| | | | | * \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into FileIO | Ananya Sen | 2012-02-29 |
| | | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | Merge branch 'refs/heads/ninja-internal-master' into FileIO | Ananya Sen | 2012-02-29 |
| | | | | |\ \ \ \ \ \ | |||
| | | | | * \ \ \ \ \ \ | Merge pull request #4 from mqg734/AnanyaFileIO | Ananya Sen | 2012-02-29 |
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix for selection bug due to bad scrollLeft and scrollTop values when switching between documents. | ||
| | | | | | * | | | | | | | Fixing typo. | Nivesh Rajbhandari | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | | * | | | | | | | Fix for selection bug due to bad scrollLeft and scrollTop values when ↵ | Nivesh Rajbhandari | 2012-02-29 |
| | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | * | | | | | | | IKNINJA-1217: use encodeURI instead to save into sessionStorage | Ananya Sen | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | | set selectionContainer before restoring selected elements | Ananya Sen | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | | fixed selection which click after switching to a document | Ananya Sen | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | | handle selections for switching documents | Ananya Sen | 2012-02-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | | fix for creatingNewFile flag | Ananya Sen | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | | minor fixes in saving undo/redo stacks per document | Ananya Sen | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | | persist selections while switching documents | Ananya Sen | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | |||