aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
* | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-16
|\ \ \ \
| * | | | Timeline: Ameliorate slowness when adding first keyframe to an element.Jon Reid2012-07-16
| | | | |
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Resolved by using both; both were needed.
| * | | | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | handling. Fix some minor bugs.
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-11
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
| |\ \ \ \ \ \
| * | | | | | | Timeline: Delete unused file.Jon Reid2012-07-09
| | | | | | | |
* | | | | | | | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug ↵Kruti Shah2012-07-16
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | Zooming the tweensKruti Shah2012-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-11
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fix layer arrayJonathan Duran2012-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Fix more missing charJonathan Duran2012-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* / | | | | Adding Zoom Control to Property TracksKruti Shah2012-07-10
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | remove commas from var linesJonathan Duran2012-07-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-09
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | Timeline: First pass at cleaning up TimelineTrack code. Changes propagatedJon Reid2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | to PropertyTrack, TimelineTrack, and Tween classes.
| | * | | | Timeline: Refactor style and layer to use pointers to parent components.Jon Reid2012-07-03
| | | | | |
| | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| | |\ \ \ \
| | * | | | | Timeline: Code refactor for Style.jsJon Reid2012-07-03
| | | | | | |
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-09
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | Update copyright boilerplateKris Kowal2012-07-06
| | | |_|/ | | |/| |
* | | | | Adding commentsKruti Shah2012-07-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Refactoring CodeKruti Shah2012-07-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Remove CommentKruti Shah2012-07-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-03
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| | |\ \ \
| | * | | | Timeline: Code refactor for Layer.jsJon Reid2012-07-03
| | | | | |
| | * | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | error on console.
| * | | | | Cleanup PropertyTrack.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Cleanup Keyframe.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Cleanup Tween.jsJonathan Duran2012-07-03
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Cleanup TimelineTrack.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Refactor Code + Bug Fix for the Colorchip disappear between breadcrumb ↵Kruti Shah2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigation Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Refactoring PropertyTrack.js & Span.jsKruti Shah2012-07-03
|/ / / / | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* / / / Fix re-open 3D tweens correctlyJonathan Duran2012-07-03
|/ / / | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Fix performance bug when moving between nested levelsJonathan Duran2012-07-02
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-02
|\ \ \
| * | | Timeline: Bug fix: Unable to reselect a layer with control-click that wasJon Reid2012-06-29
| | | | | | | | | | | | | | | | previously just deselected with control-click. (Yes, that's a weird one.)
| * | | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-previewJon Reid2012-06-29
| | | | | | | | | | | | | | | | | | | | causes each layer in the timeline to remain selected even when clicking on another layer."
* | | | Fix 3d rotate tweens not showing upJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | select keyframe when first createdJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-29
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Merge pull request #358 from jreid01/timeline-prValerio Virgillito2012-06-28
| |\ \ | | | | | | | | Timeline: Fix for deselect bug.
| | * | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section)
| * | | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
| |\ \ \ | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class.
| | * | | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| | |/ /
| * | | Merge pull request #354 from mencio/IKNINJA-1829Valerio Virgillito2012-06-28
| |\ \ \ | | |/ / | |/| |