aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Adding blocking logic to copy libsJose Antonio Marquez2012-06-03
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Adding open draw to reel componentsJose Antonio Marquez2012-06-01
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Add logic to allow dynamic placement of canvas json fileJose Antonio Marquez2012-06-01
| | | * | | | | | | | | | | | | | | | | | | | | | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #266 from mencio/element-model-fixesValerio Virgillito2012-06-05
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix references to documentController.activeDocument to currentDocument.modelJonathan Duran2012-06-06
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix error when opening file with no animationsJonathan Duran2012-06-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Merge branch 'pull-request' into timeline-localJon Reid2012-06-05
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fix line endings, set to UNIX.Jon Reid2012-06-05
| | * | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumbJon Reid2012-06-04
| | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Timeline: Better style selection and deselection. Automatic re-selection ofJon Reid2012-06-01
| | * | | | | | | | | | | | | | | | | | | | | | | | Timeline: Bug fixes for deleting styles and their associated tracksJon Reid2012-05-31
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #264 from mencio/document-bindings-fixValerio Virgillito2012-06-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | fix for the css panelValerio Virgillito2012-06-01
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into...Valerio Virgillito2012-06-01
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #8 from mqg734/dom-architecture-pentoolValerio Virgillito2012-06-01
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used ...Nivesh Rajbhandari2012-06-01
| | | * | | | | | | | | | | | | | | | | | | | | | | | fixing some selection container changes and the breadcrumb not drawing initiallyValerio Virgillito2012-06-01
| | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | / / / / / / / / / / / / / / / / / / / | | | | | |_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into document-binding...Nivesh Rajbhandari2012-06-01
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into...Valerio Virgillito2012-06-01
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | fixing the document closing when the first document is closed.Valerio Virgillito2012-06-01
| | | * | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1609 - Stage rotates too fast when closing and re-opening file or swi...Nivesh Rajbhandari2012-06-01
| | | * | | | | | | | | | | | | | | | | | | | | | | | Moving styles controller higher in ninja's serialization so its bindings will...Nivesh Rajbhandari2012-06-01
| | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | |