aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-18
|\
| * Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
| * Timeline: Bug fix: Correctly maintain expand/collapse state of layers andJon Reid2012-06-15
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
|\ \ | |/ |/|
| * Remove ninja's author-time styles for banner and animation templates on publi...Nivesh Rajbhandari2012-06-14
| * Moving location to copy body style attributeJose Antonio Marquez2012-06-14
| * Adding clean up for ninja style attributes.Jose Antonio Marquez2012-06-14
| * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-14
| |\
| * | Save user's html and body styles and inline body styles for 3d so they don't ...Nivesh Rajbhandari2012-06-14
* | | 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: fix for IKNINJA-1676, "Timeline: Can't insert a keyframe to a CSSJon Reid2012-06-15
* | | Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
* | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\ \ \ | | |/ | |/|
| * | Merge pull request #305 from joseeight/DocumentValerio Virgillito2012-06-14
| |\ \
| | * | Adding banner templateJose Antonio Marquez2012-06-14
| | |/
| * | Merge pull request #304 from mqg734/GIO_FixesValerio Virgillito2012-06-14
| |\ \
| | * | IKNinja-1710 - Boundary box is drawn offset when switching between docs. This...Nivesh Rajbhandari2012-06-14
| * | | Merge pull request #302 from joseeight/ColorValerio Virgillito2012-06-14
| |\ \ \
| | * | | Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
| | * | | Clean upJose Antonio Marquez2012-06-13
| | * | | Fix: IKNINJA-1187Jose Antonio Marquez2012-06-13
| | * | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-13
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Cleaning up color wheel componentJose Antonio Marquez2012-06-13
| * | | | Merge pull request #301 from pushkarjoshi/brushtoolValerio Virgillito2012-06-14
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| | |\ \ \ | | | | |/ | | | |/|
| | * | | fix bug #1718 (trying to delete a non-existent canvas)Pushkar Joshi2012-06-13
| | * | | fix bug #1704 where small paths/strokes with large stroke width caused a flip...Pushkar Joshi2012-06-13
| | * | | correct path resizing in case of stroke width other than 1Pushkar Joshi2012-06-13
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| | |\ \ \ | | | | |/ | | | |/|
| | * | | fixes bug #1623: middle transform handle causes the brush stroke to have a ze...Pushkar Joshi2012-06-13
| * | | | Merge pull request #300 from mqg734/IKNinja_1715Valerio Virgillito2012-06-13
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/O...Nivesh Rajbhandari2012-06-13
| | | |/ | | |/|
| * | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \
| | * | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
| | |\| |
| | * | | fixed document switching issuesValerio Virgillito2012-06-12
| | * | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| | |\ \ \ \ \
| | * | | | | | hack fix for the PI section throwing errors when dom is not ready to drawValerio Virgillito2012-06-12
| | * | | | | | remove serializable from custom sectionValerio Virgillito2012-06-12
| | * | | | | | fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| | * | | | | | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | * | | | | | Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-...Valerio Virgillito2012-06-12
| | |\ \ \ \ \ \
| | | * | | | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | * | | | | | | adding more nonexistent propertiesValerio Virgillito2012-06-12
| | * | | | | | | fixing a default propertyValerio Virgillito2012-06-12
| | |/ / / / / /
| | * | | | | | fix a typoValerio Virgillito2012-06-12
| | * | | | | | Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
| | * | | | | | fixing a timeline issueValerio Virgillito2012-06-12