aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* more sub prop additionsJonathan Duran2012-05-04
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-04
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: True drag-and-drop of keyframesJon Reid2012-05-04
| |
| * Timeline: Restore event handler for selectionChange.Jon Reid2012-05-04
| |
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-04
| |\
| | * Timeline: More fixes to selection changing and document switching.Jon Reid2012-05-04
| | |
| * | Timeline: More work on tween drag-and-dropJon Reid2012-05-03
| | |
| * | Timeline: Bug fix: Master Duration not updating when all documents areJon Reid2012-05-03
| | | | | | | | | | | | closed.
| * | Timeline: Initial keyframe drag-and-drop interaction.Jon Reid2012-05-01
| | |
| * | Timeline: Expand/collapse state of layers now mantained across documentJon Reid2012-05-01
| | | | | | | | | | | | switching.
* | | property track additions to serialization data objectJonathan Duran2012-05-04
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Fix subproperty keyframe selectionJonathan Duran2012-05-04
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | update data bindings for subproperty tracksJonathan Duran2012-05-04
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | apply old stash to new branchJonathan Duran2012-05-03
| |/ |/| | | | | | | | | initial work and stubs for sub property support. serialization for property track components and classes Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
|\ \ | | | | | | submitting project : Code Editor Improvements [Phase 1]
| * \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| |\ \
| * \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * \ \ \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
| |\ \ \ \ \
| * | | | | | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | Merge pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | Timeline uber
| * | | | | Timeline: bug fix: disable bread crumb setlevel.Jon Reid2012-04-30
| | | | | |
| * | | | | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | | | | |
| * | | | | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | |_|_|/ | |/| | |
* / | | | Dom ManipulationKruti Shah2012-05-03
|/ / / / | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \
| * \ \ \ Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵Valerio Virgillito2012-04-26
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | serialization
| | * | | | | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | |/ / / | | |/| | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
|\| | | | |
| * | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
| |\ \ \ \ \ | | |/ / / / | |/| | | | IKNINJA-1511 - We don't currently support perspective values on individual elements, so removing perspective values from the animation presets.
| | * | | | We don't currently support perspective values on individual elements, so ↵Nivesh Rajbhandari2012-04-26
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | | | |
* | | | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | | | |
* | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
|\ \ \ \ \
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\| | | |
| | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\| | |
| | * | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
|/ / / / / | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes.
* | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
|\ \ \ \ \
| * | | | | Timeline Bug Fix : 1541Kruti Shah2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
| | | | | |
* | | | | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
|/ / / / /
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ \ | | | |_|/ | | |/| |