Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
|\ | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-06 |
|\| | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Timeline: Fix line endings, set to UNIX. | Jon Reid | 2012-06-05 |
| | | |||
| * | Timeline: Fixes to timeline to handle document switching & breadcrumb | Jon Reid | 2012-06-04 |
| | | | | | | | | interactions under new DOM Architecture. | ||
* | | first iteration of adding serializable to ninja plus other changes to run ↵ | Valerio Virgillito | 2012-06-06 |
|/ | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | fixing the timeline current document bindings | Valerio Virgillito | 2012-05-30 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | document bindings phase 1 | Valerio Virgillito | 2012-05-29 |
| | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
|\ | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| * | adding document views checks for the timeline and breadcrumb | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Timeline triggerBinding needs to be set to false in the track data. | Nivesh Rajbhandari | 2012-05-23 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
|/ | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
* | Timeline should not select an element when a layer is selected by code. | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | fixing the timeline selecting when creating a new layer | Valerio Virgillito | 2012-05-11 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵ | Valerio Virgillito | 2012-05-10 |
| | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Removing unused components references | Valerio Virgillito | 2012-05-03 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge pull request #191 from imix23ways/TimelineUber | Valerio Virgillito | 2012-05-03 |
|\ | | | | | Timeline uber | ||
| * | Timeline: bug fix: disable bread crumb setlevel. | Jon Reid | 2012-04-30 |
| | | |||
| * | Timeline: Change serialization parameters for some component properties. | Jon Reid | 2012-04-30 |
| | | |||
| * | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 |
| | | |||
* | | Dom Manipulation | Kruti Shah | 2012-05-03 |
|/ | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
|\ | |||
| * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
* | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Timeline: Deleting elements now deletes associated layers. | Jon Reid | 2012-04-26 |
| | | |||
* | | Timeline: comment out a conditional debugger; re-enable layer name storage. | Jon Reid | 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 |
|/ / | |||
* | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 |
| | | | | | | | | 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> | ||
* | | 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. | ||
| * \ | 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> | ||
* | | | | Timeline: Bug fix: Maintain selection between document switching. | Jon Reid | 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> | ||
* | | | 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> | ||
* | | 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 |
| | |