aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ...Jon Reid2012-02-24
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Timeline: Add hottext fields to layers and serialize them throughout.Jon Reid2012-02-23
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | - added flag for timeline to identify new file flowJonathan Duran2012-02-24
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | add back layer selectionJonathan Duran2012-02-23
| * | | | | | | | | | | | | | | | | Remove unneeded selection codeJonathan Duran2012-02-23
| * | | | | | | | | | | | | | | | | Move element selection to click handlerJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | * Merge pull request #4 from mqg734/AnanyaFileIOAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * Fixing typo.Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | * Fix for selection bug due to bad scrollLeft and scrollTop values when switchi...Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | | * IKNINJA-1217: use encodeURI instead to save into sessionStorageAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | * set selectionContainer before restoring selected elementsAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | * fixed selection which click after switching to a documentAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | * handle selections for switching documentsAnanya Sen2012-02-29
| | | | | | | | | | | | | | | | | * fix for creatingNewFile flagAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | * minor fixes in saving undo/redo stacks per documentAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | * persist selections while switching documentsAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | * reverted null check as per requestAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | * reverting null checks as per requestAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | * Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | |_|_|_|/ | | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-27
| | | | | | | | | | | | |/| | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | adding the template-creator classValerio Virgillito2012-02-27
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | Updating legal copyJose Antonio Marquez2012-02-27
| | | | | | | | | | |/ / / / /
| | | | | | | | | | * | | | | Updating creditsJose Antonio Marquez2012-02-27
| | | | | | | | | | * | | | | Merge pull request #21 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-27
| | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | * persist undo/redo stack per html documentAnanya Sen2012-02-27
| | | | | | | | | | | | | | * updating to codemirror 2.22Ananya Sen2012-02-27
| | | | | | | | | | | |_|_|/ | | | | | | | | | | |/| | |
| | | | | | | | | | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | |/ / / / | | | | | | | | | |/| | | |
| | | | | | | | | * | | | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| | | | | | | | | * | | | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| | | | | | |_|_|/ / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| | | | | * | | | | | | | Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | | * | | | | | | | Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| | | | | * | | | | | | | Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | | | | * | | | | | | | Adding prettify code to I/OJose Antonio Marquez2012-02-24
| | | | |/ / / / / / / /
| | | | * | | | | | | | Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #69 from mayhewinator/WorkingBranchmayhewinator2012-02-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Removing tabs permissions until we make a final decision on whether or not we...John Mayhew2012-02-24
|/ / / / / / / / / / / /
* | | | | | | |