Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Squashed commit of the following: | Jonathan Duran | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | | commit b23502b8ed6856981d09577d4cf24283e5db8afa Author: Kruti Shah <kruti.shah@motorola.com> Date: Mon May 14 10:48:16 2012 -0700 Removed Debugger Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit c0b531a074e9cf9a964da0cda496bba8d7453ec1 Author: Kruti Shah <kruti.shah@motorola.com> Date: Fri May 11 13:55:18 2012 -0700 Changing Doc Layer Name Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-11 |
|\ | |||
| * | Timeline: Bug fixes for keyframe drag and drop. | Jon Reid | 2012-05-09 |
| | | |||
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-09 |
| |\ | |||
| | * | Timeline: Automatic scrolling during dragging of keyframes. | Jon Reid | 2012-05-08 |
| | | | |||
| | * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes. | Jon Reid | 2012-05-08 |
| | | | |||
| | * | Timeline: Update drag and drop handlers to be unique for drag and drop type. | Jon Reid | 2012-05-08 |
| | | | |||
| | * | Timeline: Move keyframe dragover and drop listeners to TimelinePanel for | Jon Reid | 2012-05-07 |
| | | | | | | | | | | | | interaction improvements. | ||
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-09 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Update timeline CSS to allow longer layer labels by default | Jonathan Duran | 2012-05-08 |
|/ / | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Timeline: Restore event handler for selectionChange. | Jon Reid | 2012-05-04 |
| | | |||
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-04 |
|\ \ | |||
| * | | Timeline: More fixes to selection changing and document switching. | Jon Reid | 2012-05-04 |
| |/ | |||
| * | Merge pull request #191 from imix23ways/TimelineUber | Valerio Virgillito | 2012-05-03 |
| |\ | | | | | | | Timeline uber | ||
| * | | Dom Manipulation | Kruti Shah | 2012-05-03 |
| | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | | Timeline: Bug fix: Master Duration not updating when all documents are | Jon Reid | 2012-05-03 |
| | | | | | | | | | | | | closed. | ||
* | | | Timeline: Initial keyframe drag-and-drop interaction. | Jon Reid | 2012-05-01 |
| |/ |/| | |||
* | | 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 |
|/ | |||
* | 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 |
|/ / | |||
* | | 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 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> | ||
* | | 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 |
| | | |||
* | | Timeline: Bug fixes for restoring tweens on new document and breadcrumb. | Jon Reid | 2012-04-13 |
| | | |||
* | | Timeline: Remove default style track. | Jon Reid | 2012-04-13 |
| | | |||
* | | Timeline: More bug fixes for document switching. | Jon Reid | 2012-04-13 |
| | | |||
* | | Timeline: More bug fixes. | Jon Reid | 2012-04-12 |
| | | |||
* | | Timeline: Bug fixes: Document switching between new documents now working. | Jon Reid | 2012-04-12 |
| | | | | | | | | | | Fixed problem with MasterDuration not being set correctly on document switch. |