aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
|\
| * remove bad fileJonathan Duran2012-06-20
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\
| | * Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\
| | | * Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| | | |
| | | * Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| | | |\
| | * | \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\ \ \ | | | | |/ | | | |/|
| | * | | remove unneeded filesJonathan Duran2012-06-20
| | | |/ | | |/| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | remove obsolete functionsJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
| | |\ \
| | * | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
| | | | | | | | | | | | | | | | | | | | manipulation!
| * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | prop tween splittingJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| | |/ / | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | LockedElements - LayersKruti Shah2012-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | Layer LockKruti Shah2012-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | Lock ElementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | Lock ELementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | Locked Elements. Layer ControlsKruti Shah2012-06-19
| |/ / | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-19
| |\ \
| | * | Timeline: Enable splitting of keyframes with F6 interaction.Jon Reid2012-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 CSSJon Reid2012-06-18
| | | | | | | | | | | | | | | | standard.
| | * | Timeline: Bug FixesJon Reid2012-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 TimelineUberJonathan Duran2012-06-19
| |\ \ \ | | |/ / | |/| |
| * | | Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
| | | | | | | | | | | | | | | | added.
| * | | Timeline: Bug fix: Correctly maintain expand/collapse state of layers andJon Reid2012-06-15
| | | | | | | | | | | | | | | | subproperties across document switching.
| * | | Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined".Jon Reid2012-06-15
| | | |
| * | | Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly displayed inJon Reid2012-06-15
| | | | | | | | | | | | | | | | Timeline after a file is saved and re-opened."
| * | | Timeline: fix for IKNINJA-1676, "Timeline: Can't insert a keyframe to a CSSJon Reid2012-06-15
| | | | | | | | | | | | | | | | property after deleting one"
| * | | Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
| | | |
| * | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-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 menuJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Hide timeline zoom slider temporarilyJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | remove console logsJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Fix sub prop re-open for tweensJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | F6 support for keyframesJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Timeline: fix serialization error.Jon Reid2012-06-14
| | | | |
| * | | | Timeline: New easing menu.Jon Reid2012-06-14
| | | | |
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into new-easing-menuJon Reid2012-06-14
| |\ \ \ \
| | * | | | Fix the broken animationKruti Shah2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | Timeline: More work on new easing menu.Jon Reid2012-06-13
| | | | | |
| * | | | | Timeline: New popup menu for easing choices.Jon Reid2012-06-12
| |/ / / /
| * | | | Clean upKruti Shah2012-06-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | remove unneeded serializationJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | remove some console logs and simply the prop tween retrieval conditionsJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | Squashed commit of the following:Jonathan Duran2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 8e98ce012f55576ddb979969a3a1d834301af0c7 Author: Jon Reid <tjh487@motorola.com> Date: Fri Jun 8 18:08:38 2012 -0700 Timeline: New feature: Only one easing menu can be open at a time. Signed-off-by: Jonathan Duran <jduran@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 06:25:51 +0000