aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into int...Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | / / / | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools.Nivesh Rajbhandari2012-02-27
| | * | | | | | | | | | Reset translation values as well when double-clicking to reset the rotation v...Nivesh Rajbhandari2012-02-27
* | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-29
* | | | | | | | | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Timeline: Fix Selection , Partially Fix adding element to an already animated...Kruti Shah2012-02-28
* | | | | | | | | | | | | fix for creatingNewFile flagJonathan Duran2012-02-29
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix for double clicking in the resizerValerio Virgillito2012-02-27
| * | | | | | | | | | adding the template-creator classValerio Virgillito2012-02-27
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Timeline : Deleting Layer deletes the element, Deleting Layer selects another...Jonathan Duran2012-02-28
* | | | | | | | | | Fix element selection on open docJonathan Duran2012-02-28
* | | | | | | | | | Timeline: Basic document switching.Jon Reid2012-02-28
* | | | | | | | | | Fix to animation names to support multiclassed elementsJonathan Duran2012-02-28
* | | | | | | | | | remove commentJonathan Duran2012-02-28
* | | | | | | | | | todo noteJonathan Duran2012-02-28
* | | | | | | | | | Fix re-reopened animation duration and millisecondsJonathan Duran2012-02-28
* | | | | | | | | | Timeline: Successfully unbind event listeners in tweens when clearing timeline.Jon Reid2012-02-27
* | | | | | | | | | Timeline: try to clean up bogus events manually.Jon Reid2012-02-27
* | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Reverting the export for publish property since its only used for testing.Valerio Virgillito2012-02-27
* | | | | | | | | | | Timeline: More work on clear timeline method.Jon Reid2012-02-27
* | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
|\| | | | | | | | | |
| * | | | | | | | | | Timeline : Reopening Doc has layer 1 default fixJonathan Duran2012-02-27
| * | | | | | | | | | Timeline: RetrieveStoredTweens calling fixedJonathan Duran2012-02-27
| * | | | | | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| |\| | | | | | | | |
| | * | | | | | | | | Merge branch 'local-storage-version' of https://github.com/mencio/ninja-inter...Valerio Virgillito2012-02-27
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | removing the old settings class and disabling panel settings until the new pa...Valerio Virgillito2012-02-24
| | | * | | | | | | | | clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | * | | | | | | | | prefixing the local storage and using the new local-storage object.Valerio Virgillito2012-02-24
| | | * | | | | | | | | fixing the right panel disappearing when collapsed and re-enabledValerio Virgillito2012-02-24
| | | * | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | * | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | * | | | | | | | | local storage integration and versioningValerio Virgillito2012-02-22
| | * | | | | | | | | | Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-i...Valerio Virgillito2012-02-27
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | / / / | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge pull request #20 from joseeight/FileIOJose Antonio Marquez Russo2012-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
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | * | | | | | - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | * | | | | | - added flag for timeline to identify new file flowAnanya Sen2012-02-24
| | | | * | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | | |\ \ \ \ \ \
| | | | * | | | | | | refresh draw-utils, snap-manager, view-utils for html document stitchingAnanya Sen2012-02-23
| | | | * | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a...Ananya Sen2012-02-23