Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Timeline: Bug fix: IKNINJA-1435 | Jon Reid | 2012-04-05 |
| | |||
* | Changing layer name should put dirty flag on doc | Jonathan Duran | 2012-04-04 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | define "that" var correctly | Jonathan Duran | 2012-04-04 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUber | Jonathan Duran | 2012-04-04 |
|\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: Saving layername | Kruti Shah | 2012-04-04 |
| | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | Timeline: disable console logs in layer component. | Jon Reid | 2012-04-03 |
| | | |||
* | | Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with one | Jon Reid | 2012-04-02 |
| | | | | | | | | | | layer in focus whose name is empty, Ninja creates an empty name layer for the element." | ||
* | | Timeline: Bug fixes. | Jon Reid | 2012-03-30 |
|/ | |||
* | Timeline: Stability fixes for drag-and-drop and page switching. | Jon Reid | 2012-03-27 |
| | |||
* | Timeline: Drag and Drop of layers. | Jon Reid | 2012-03-26 |
| | |||
* | Timeline: First integration of drag and drop of layers. | Jon Reid | 2012-03-21 |
| | |||
* | Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵ | Jon Reid | 2012-03-21 |
| | | | | console.log calls in hintable component. | ||
* | Timeline: fix layer and style select problems. | Jon Reid | 2012-03-20 |
| | |||
* | Timeline: Re-enable adding/removing styles to layers. New methods in ↵ | Jon Reid | 2012-03-19 |
| | | | | TimelinePanel for creating new styles on document load. | ||
* | Merge branch 'Timeline-local' into Timeline-local-2 | Jon Reid | 2012-03-16 |
|\ | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-16 |
| |\ | |/ |/| | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | ||
| * | Timeline: Hook up data binding for changes on subproperties. | Jon Reid | 2012-03-16 |
| | | |||
| * | Timeline: Remove selection timer on add new layer method. | Jon Reid | 2012-03-15 |
| | | |||
| * | Timeline: Fix for layer selection problems on file open and switch. | Jon Reid | 2012-03-15 |
| | | |||
* | | Timeline: remove comment. | Jonathan Duran | 2012-03-15 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Timeline: Fix for layer selection problems on file open and switch. | Jonathan Duran | 2012-03-15 |
|/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline: Fixes for deleting layers, layer selection, persisting layer name ↵ | Jon Reid | 2012-03-09 |
| | | | | edits and selection between document switching. | ||
* | Remove unnecessary needsDraw calls | Jonathan Duran | 2012-03-08 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | cleanup | Jonathan Duran | 2012-03-07 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Bugfixes from optimization | Jonathan Duran | 2012-03-07 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Optimize Timeline serialization | Jonathan Duran | 2012-03-07 |
| | | | | | | Change all serialized properties into one big object to reduce bindings Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline: Code cleanup. Fix bug with unfound property in serialization. | Jon Reid | 2012-03-06 |
| | |||
* | Timeline: Serialization of all Collapser components | Jon Reid | 2012-03-02 |
| | |||
* | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-01 |
|\ | |||
| * | Timeline: Merge arrlayers and arrtracks into one object. | Jon Reid | 2012-03-01 |
| | | | | | | | | Redefine collapser to use property binding instead of events. | ||
* | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-03-01 |
|\ \ | |/ |/| | |||
| * | Squashed commit of the workspace-bugs | Valerio Virgillito | 2012-03-01 |
| | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Timeline: efficiency improvements to collapser. Document switching. | Jon Reid | 2012-03-01 |
| | | |||
* | | Timeline: Merge. Set collapser heights. | Jon Reid | 2012-03-01 |
|/ | |||
* | Timeline: More work on clear timeline method. | Jon Reid | 2012-02-27 |
| | |||
* | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 |
|\ | |||
| * | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 |
|/ | |||
* | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 |
| | | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Squashed commit of the following: | Jonathan Duran | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 46292bddbfbe7415c6852142dd10fd02a276722a Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:32:22 2012 -0800 Timeline: turn off console logging. commit b8de88393182bc6e819c3d6a290ade2f804236ac Merge: e651344 37b952c Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:10:06 2012 -0800 Merge branch 'Timeline-jduran' into Timeline-jreid commit e651344d5d6c2911b31a54510c65a349c4d52db2 Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:08:25 2012 -0800 Timeline: Bug fixes IKNINJA-947: Weird behavior with adding layers with an empty layer name selected IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers IKNINJA-1063: Styles can be added while style column is collapsed IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline: select/deselect layers. Work on focus/blur for layers. | Jon Reid | 2012-02-07 |
| | |||
* | merge new timeline | Jonathan Duran | 2012-02-06 |
Signed-off-by: Jonathan Duran <jduran@motorola.com> |