aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
|\
| * Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| |\ | | | | | | Remove doc type from files and adding tag check for html
| | * Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | | | | | | | | | | | Removed the HTML5 doctype from files since it was break the YouTube component, also made a fix to check for the HTML tag to be present when copying attributes.
| * | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| |\ \ | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error
| | * | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | |\|
| | * | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| |\ \ \ | | |_|/ | |/| | Brushtool
| | * | fix compile error that was preventing non-gradient brush strokes from being ↵Pushkar Joshi2012-06-07
| | | | | | | | | | | | | | | | rendered in runtime
| | * | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | | |
| | * | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | |\ \
| | * | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | | |
| | * | | enable gradients for brush stroke (in authoring as well as runtime)Pushkar Joshi2012-06-06
| | | | |
| | * | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js
| | * \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | |\ \ \ \
| | * | | | | removed repeated declarations in brush stroke runtime classPushkar Joshi2012-06-04
| | | | | | |
| | * | | | | runtime version of the brush stroke (similar to the pen paths, this seems to ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not work unless we run it through the debugger)
| | * | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-31
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-22
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-05-22
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #283 from mqg734/BodyPIValerio Virgillito2012-06-07
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Body PI fixes.
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | Body PI fixes.Nivesh Rajbhandari2012-06-07
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Merge pull request #281 from joseeight/FileIOValerio Virgillito2012-06-07
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Adding partial unique ID to data files
| | * | | | | | | | | Fixing empty property bug with montage class on HTML tagJose Antonio Marquez2012-06-07
| | | | | | | | | | |
| | * | | | | | | | | Minor fixesJose Antonio Marquez2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensuring montage style is removed and doctype is included.
| | * | | | | | | | | Adding support for html and head tags attributesJose Antonio Marquez2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both on open and close, Chrome randomly changes order of attributes, so this is browser induced bug.
| | * | | | | | | | | Fixing unique ID storeJose Antonio Marquez2012-06-07
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-07
| | |\| | | | | | | |
| | * | | | | | | | | Adding unique ID to canvas data foldersJose Antonio Marquez2012-06-07
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Also set up for tracking ID created, will be adding support for parsing files without saving later, but flag is now present.
| * | | | | | | | | Merge pull request #282 from mencio/colorchip-fixValerio Virgillito2012-06-07
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | fixing the body color chip for non banners templates
| | * | | | | | | | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge pull request #275 from mencio/element-model-fixesValerio Virgillito2012-06-07
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Element model fixes and selection fixes
| | * | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/LineTool.js js/tools/ShapeTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge pull request #276 from mqg734/DrawingToolsValerio Virgillito2012-06-06
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Do not create any tags or shapes with width or height of 0.
| | * | | | | | | | Do not create any tags or shapes with width or height of 0.Nivesh Rajbhandari2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Merge pull request #274 from ananyasen/bugfix-masterValerio Virgillito2012-06-06
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Bugfix master
| | * | | | | | | | | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-05
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | IKNINJA-1645- fix - don't disable OK button on change of file typeAnanya Sen2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | * | | | | | | fixing a rotation and zoom bugValerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | | | | |\ \ \ \ \ \ \ | | |_|_|_|/ / / / / / /