| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-06-21 |
| |\ | |||
| | * | Merge pull request #316 from imix23ways/Timeline-merge-candidate | Valerio Virgillito | 2012-06-20 |
| | |\ | | | | | | | Timeline merge candidate | ||
| | | * | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | |\ | | |/ | |/| | |||
| | | * | remove bad file | Jonathan Duran | 2012-06-20 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 |
| | | |\ | |||
| | | | * | Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | | |\ | |||
| | | | | * | Timeline: Bug fix: Keyframe animation now works with 3D elements. | Jon Reid | 2012-06-20 |
| | | | | | | |||
| | | | | * | Merge remote-tracking branch 'ninja-internal/master' into timeline-local | Jon Reid | 2012-06-20 |
| | | | | |\ | |||
| | | | | * \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-20 |
| | | | | |\ \ | |||
| | | | * | \ \ | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||
| | | | * | | | | remove old method | Jonathan Duran | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | remove unneeded files | Jonathan Duran | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | | |\ \ \ \ | | | | |_|/ / | | | |/| | / | | | | | |/ | | | | |/| | |||
| | | * | | | | Removed some code | Kruti Shah | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | | * | | | remove obsolete functions | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 |
| | | | |\ \ \ | |||
| | | | * | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manipulation! | ||
| | | * | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-19 |
| | | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||
| | | | * | | | | prop tween splitting | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | Lock Position and Size keyframes to main track keyframes | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | Fix position tracks collapser to use unique element | Jonathan Duran | 2012-06-19 |
| | | | |/ / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | LockedElements - Layers | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | Layer Lock | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | Lock Elements | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | Lock ELements | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | Locked Elements. Layer Controls | Kruti Shah | 2012-06-19 |
| | | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-19 |
| | | |\ \ \ | |||
| | | | * | | | Timeline: Enable splitting of keyframes with F6 interaction. | Jon Reid | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug fix: Error on console if you press F6 with no layer selected. | ||
| | | | * | | | Timeline: Default easing for new animation keyframes set to "none" per CSS | Jon Reid | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | standard. | ||
| | | | * | | | Timeline: Bug Fixes | Jon Reid | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Splitting tweens now works again for shift-click interaction - Fixed visual "jump" in keyframes and spans when splitting tweens - Set default easing to "none" to match CSS standard. | ||
| | | * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
| | | |\ \ \ \ | | | |/ / / | | |/| | | | |||
| | | * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-18 |
| | | |\ \ \ \ | |||
| | | | * | | | | Timeline: Bug fix: Document switching no longer causes multiple styles to be | Jon Reid | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added. | ||
| | | | * | | | | Timeline: Bug fix: Correctly maintain expand/collapse state of layers and | Jon Reid | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subproperties across document switching. | ||
| | | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-18 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | | * | | | | | Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined". | Jon Reid | 2012-06-15 |
| | | | | | | | | |||
| | | * | | | | | Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly displayed in | Jon Reid | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline after a file is saved and re-opened." | ||
| | | * | | | | | Timeline: fix for IKNINJA-1676, "Timeline: Can't insert a keyframe to a CSS | Jon Reid | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property after deleting one" | ||
| | | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-15 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | Timeline: Replace currentSelectedContainer with new model.domContainer. | Jon Reid | 2012-06-15 |
| | | | | | | | | | |||
| | | * | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | | * | | | | | | | Remove obsolete absolute/relative options from timeline config menu | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | | Hide timeline zoom slider temporarily | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | | remove console logs | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | | Fix sub prop re-open for tweens | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | | F6 support for keyframes | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | | Timeline: fix serialization error. | Jon Reid | 2012-06-14 |
| | | | | | | | | | | |||
| | | * | | | |||