aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | 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 Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | | | | | | reverting null checks as per requestAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-28
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | persist undo/redo stack per html documentAnanya Sen2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | | | | | | | updating to codemirror 2.22Ananya Sen2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | | | | | | | | * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-02-29
| | | | | | | | | | | | |\ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| | | | | | | | | | | | * | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-28
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
| | | | | | | | | | | | |\ \ \ \ \
| | | | | |