aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Squashed commit of the following:Jonathan Duran2012-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>
* repetition fixJonathan Duran2012-05-11
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-11
|\
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-11
| |\
| | * Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Timeline: Bug fixes for keyframe drag and drop.Jon Reid2012-05-09
| | |
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
| |\ \
| | * | Timeline: Automatic scrolling during dragging of keyframes.Jon Reid2012-05-08
| | | |
| | * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes.Jon Reid2012-05-08
| | | |
| | * | Timeline: Update drag and drop handlers to be unique for drag and drop type.Jon Reid2012-05-08
| | | |
| | * | Timeline: Move keyframe dragover and drop listeners to TimelinePanel forJon Reid2012-05-07
| | | | | | | | | | | | | | | | interaction improvements.
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Fixing the color popupValerio Virgillito2012-05-04
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\
| | | * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | code cleanupValerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Fixing the lock button cssValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| | |\ \ \ \ \
| | | * | | | | Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
| | | | |_|/ / | | | |/| | |
| | * / | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-04-30
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Fix a bug in span splitting interaction and remove console logsJonathan Duran2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | allow splitting existing spans with new keyframeJonathan Duran2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Timeline: Bug fix: tweens now hide when their container collapses.Jonathan Duran2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Some sub prop updatesJonathan Duran2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | sub property additionsJonathan Duran2012-05-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Update timeline CSS to allow longer layer labels by defaultJonathan Duran2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Change sub property track arraysJonathan Duran2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:53:20 +0000