| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-26 | |
| | |\ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||
| | | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | | |\ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | ||||
| | * | | | | | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document change | Jon Reid | 2012-04-26 | |
| | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes. | |||
| | * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-25 | |
| | |\| | | | | | | | ||||
| | | * | | | | | | | Timeline Bug Fix : 1541 | Kruti Shah | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | | | | | Timeline: Handling of multiselect of elements from stage. | Jon Reid | 2012-04-25 | |
| | | | | | | | | | | ||||
| | * | | | | | | | | Timeline: New tracking for multiple selected layers. | Jon Reid | 2012-04-25 | |
| | |/ / / / / / / | ||||
| | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 | |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||
| | * | | | | | | | Revert "Fix Pen Tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0475cb7e37601366ec07d77fcea44269d3d49633. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | Fix Brush tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | Fix Pen Tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | Change sublayer property names to match css property names | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | Fix Select All bug and remove debuggers | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-20 | |
| | |\ \ \ \ \ \ \ | ||||
| | | * | | | | | | | Timeline: More bug fixes for selection with multiple documents opening and | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closing. | |||
| | | * | | | | | | | Timeline: Bug fix: check for uninitialized currentDocument in intialization | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routine. | |||
| | | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-19 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine. | |||
| | | * | | | | | | | | Timeline: Bug fix: Maintain selection between document switching. | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | ||||
| | * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-20 | |
| | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||
| | * | | | | | | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵ | Jonathan Duran | 2012-04-19 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimelineUber | |||
| | | * | | | | | | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 | |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||
| | * | | | | | | | | | Remove more unneeded requires | Jonathan Duran | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | | | Remove unneeded require | Jonathan Duran | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | Remove TODOs | Jonathan Duran | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | | | | Add flag for abs/rel position | Jonathan Duran | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | | | | FIX for layer selection when adding a keyframe in unselected layer | Jonathan Duran | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-18 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||
| | | * | | | | | | | | | Timeline: Bug fix: changing layer name didn't save in some circumstances. | Jon Reid | 2012-04-17 | |
| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | Timeline: Further fixes to new document/breadcrumb interactions. | Jon Reid | 2012-04-17 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-18 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||
| | * | | | | | | | ||||