aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-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>
* | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
|\|
| * 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>
| * | 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/ninjainternalmaster' into Timeline-RefactorCodeKruti Shah2012-07-03
| |\ \ \
| * | | | 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>
* | | | | Timeline: Delete unused file.Jon Reid2012-07-09
| |_|_|/ |/| | |
* | | | 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>
| * | | | adding missing copyright to the feed reader.Valerio Virgillito2012-07-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #373 from kriskowal/bsdValerio Virgillito2012-07-06
| |\ \ \ \ | | |_|_|/ | |/| | | Update copyright boilerplate
| | * | | Update copyright boilerplateKris Kowal2012-07-06
| |/ / /
* | | | 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
| | | | |
| * | | | Merge remote-tracking branch 'origin/timeline-local' into timeline-localJon Reid2012-07-02
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js use mine; no idea why Git did this.
| | * | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | error on console.
| * | | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| |/ / / / | | | | | | | | | | | | | | | error on console.
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-03
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | adding missing montage to the user library and temporary fix for picas ↵Valerio Virgillito2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #369 from aadsm/gh-329_template-creator-restores-elementValerio Virgillito2012-07-03
| |\ \ \ \ | | | | | | | | | | | | gh-329 Make Template Creator restore the elements after serialization
| | * | | | gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-07-03
| |/ / / / | | | | | | | | | | To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state.
* | | | | 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>
* | | 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-07-02
|\ \ \ | | |/ | |/|
| * | updating to version 7.0Valerio Virgillito2012-06-29
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #360 from joseeight/DocumentValerio Virgillito2012-06-29
| |\ \ | | | | | | | | Adding fix to prevent video from playing
| | * \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
| |\ \ \ | | | | | | | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 05:07:57 +0000