aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-07
|\
| * Merge pull request #99 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-06
| |\ | | | | | | File IO Updates
| | * Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| | |\
| | | * Adding CDN support for URLs in linked CSSJose Antonio Marquez2012-03-06
| | | |
| | | * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | | |\ | | |_|/ | |/| | | | | | | | | | Conflicts: js/controllers/selection-controller.js
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
| |\ \ \
| * | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-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 bugJose Antonio Marquez2012-03-06
| | | | |
| | | | * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | | | |\
| | | * | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| | | |\| |
| | | | * | Changing length of characters per line (pretty function)Jose Antonio Marquez2012-03-06
| | | | | |
| | | * | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\| |
| | | | * | CSS on CDN preview fixJose Antonio Marquez2012-03-05
| | | | | |
| | | * | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\| |
| | | | * | Temp support for CDN CSSJose Antonio Marquez2012-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-CandidateJose Antonio Marquez2012-03-05
| | | |\| |
| | | | * | Minor FixJose Antonio Marquez2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to comment out the return, therefore preventing to save.
| | | * | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\| |
| | | | * | Fixed URL parsing issue on actual opened documentJose Antonio Marquez2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Still need to implement CSS loaded from a CDN, currently this would break Ninja.
| | | * | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\| |
| | | | * | Resolved URL path issues in document and CSSJose Antonio Marquez2012-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 parsingJose Antonio Marquez2012-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 cleanedJose Antonio Marquez2012-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 FileIOJose Antonio Marquez2012-03-02
| | | | |\ \
| | | * | \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-02
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Formatting fixesJose Antonio Marquez2012-03-02
| | | | |/ / | | | |/| |
| | | * | | Minor logic fixes for URL resolution in CSSJose Antonio Marquez2012-03-02
| | | | | |
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | | |\ \ \
| | | * | | | Fixing CSS URL issuesJose Antonio Marquez2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only partially, supporting unquoted files under same root.
| | | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | | |\ \ \ \
| | | * | | | | Fixing IO RegExJose Antonio Marquez2012-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 FileIOJose Antonio Marquez2012-03-01
| | | |\ \ \ \ \
| | | * | | | | | Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the way the webRequest maps to the file.
| | | * | | | | | Merge pull request #24 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-29
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | undo/redo per document , codemirror 2.22 update
| | | | * \ \ \ \ \ Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-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 FileIOAnanya Sen2012-02-29
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge pull request #4 from mqg734/AnanyaFileIOAnanya Sen2012-02-29
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix for selection bug due to bad scrollLeft and scrollTop values when switching between documents.
| | | | | * | | | | | | Fixing typo.Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | | | | | | Fix for selection bug due to bad scrollLeft and scrollTop values when ↵Nivesh Rajbhandari2012-02-29
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | | | | | IKNINJA-1217: use encodeURI instead to save into sessionStorageAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | set selectionContainer before restoring selected elementsAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | fixed selection which click after switching to a documentAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | handle selections for switching documentsAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | fix for creatingNewFile flagAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | minor fixes in saving undo/redo stacks per documentAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | persist selections while switching documentsAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | reverted null check as per requestAnanya Sen