aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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-13
| |\
| * | fixed document switching issuesValerio Virgillito2012-06-12
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | disabling the warningsValerio Virgillito2012-06-12
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | remove serializable from custom sectionValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | fixing the feed readerValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | fix for the the components not rendering and not selectingValerio 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
| | * \ \ \ \ Merge pull request #296 from imix23ways/jd-pullreqValerio Virgillito2012-06-12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | fix montage serialization in timeline for v10
| | | * | | | | 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>
| * | | | | Merge pull request #295 from jreid01/pullrequest-v10Valerio Virgillito2012-06-12
| |\ \ \ \ \ | | | | | | | | | | | | | | Timeline: Update document switching to work under Montage v.10
| | * | | | | 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>
| * | | | | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | removing serializable to the tree and adding a few 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>
| * | | | | | | adding the latest v0.10 montageValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #291 from joseeight/TempPromptUIValerio Virgillito2012-06-13
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Adding temp prompts
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Adding temp prompt UI componentJose Antonio Marquez2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close.
| | * | | | | | Adding close Ninja promptJose Antonio Marquez2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a prompt to the user to ensure all data is saved prior to closing the application. This will not let me check for documents to need saving, so it must be general and will appear at all times.
| * | | | | | | Merge pull request #290 from pushkarjoshi/brushtoolValerio Virgillito2012-06-12
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Brushtool
| | * | | | | | change the brush runtime to ignore hardness in case of strokewidth of 1Pushkar Joshi2012-06-12
| | | | | | | |
| | * | | | | | ignore hardness for calligraphic brushes if stroke width is 1Pushkar Joshi2012-06-12
| | | | | | | |
| | * | | | | | correct mouse cursor on mousemovePushkar Joshi2012-06-12
| | | | | | | |
| | * | | | | | allow the addition of anchor points to a closed path (the mouse move cursor ↵Pushkar Joshi2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still needs to be updated)
| | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-12
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-11
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | fix the brush tool runtime: update the brush coordinates to account for ↵Pushkar Joshi2012-06-11
| | | | | | | | | | | | | | | | | | | | | | |