aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* 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
| * Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
| | | | | | | | Changing icon, seems low res and improper size, should be hi-res PNG for future reference, using negative space offset to better display.
| * Clean upJose Antonio Marquez2012-06-13
| |
| * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| | |\
| | * | remove serializable from custom sectionValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'montage-v10-integration' of ↵Valerio Virgillito2012-06-12
| | |\ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
| | | * | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | adding more nonexistent propertiesValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing a default propertyValerio Virgillito2012-06-12
| | |/ / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | fix a typoValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
| | | |
| | * | fixing a timeline issueValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing properties to the timelineValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | removing the serializable from the timeline repetition and fixing the panels ↵Valerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | currentDocument binding Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | We need to guard against cases where some PI controls are using HottextUnit ↵Nivesh Rajbhandari2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but don't actually allow uses to change those units. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #289 from mqg734/PI_Global3dValerio Virgillito2012-06-12
| | |\ \ \ \ | | | |_|_|/ | | |/| | | IKNinja-1377 - Global rotation does not work if object is translated in z.
| | | * | | Fixing typo.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Removing unused requires from 3d PI section.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | IKNinja-1377 - Global rotation does not work if object is translated in z.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| |\| | |
| * | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | 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>
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| |\ \ \ \ \ | | | |/ / / | | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 22:26:01 +0000