| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into new-easing-menu | Jon Reid | 2012-06-14 |
| |\ | |||
| | * | Merge pull request #1 from ntfx47/TimelineUber | Jonathan Duran | 2012-06-13 |
| | |\ | | | | | | | Timeline uber | ||
| | | * | Fix the broken animation | Kruti Shah | 2012-06-12 |
| | |/ | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | Timeline: More work on new easing menu. | Jon Reid | 2012-06-13 |
| | | | |||
| * | | Timeline: New popup menu for easing choices. | Jon Reid | 2012-06-12 |
| | | | |||
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-12 |
| |\| | |||
| | * | Clean up | Kruti Shah | 2012-06-12 |
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-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 serialization | Jonathan Duran | 2012-06-12 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | montage v10 serialization updates for timeline | Jonathan Duran | 2012-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 conditions | Jonathan Duran | 2012-06-12 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | Squashed commit of the following: | Jonathan Duran | 2012-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 TimelineUber | Jonathan Duran | 2012-06-11 |
| | | |\ | |||
| | | | * | Merge pull request #285 from joseeight/FileIO | Valerio Virgillito | 2012-06-08 |
| | | | |\ | | | | | | | | | | | Remove doc type from files and adding tag check for html | ||
| | | | | * | Remove doc type from files and adding tag check for html | Jose Antonio Marquez | 2012-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-fix | Valerio Virgillito | 2012-06-08 |
| | | | |\ \ | | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error | ||
| | | | | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2 | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | | Merge branch 'refs/heads/master' into timeline-resizer-fix | Valerio Virgillito | 2012-06-08 |
| | | | | |\| | |||
| | | | | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger error | Valerio Virgillito | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | Merge pull request #280 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-06-08 |
| | | | |\ \ \ | | | | |_|/ | | | |/| | | Brushtool | ||
| | | | | * | | fix compile error that was preventing non-gradient brush strokes from being ↵ | Pushkar Joshi | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | rendered in runtime | ||
| | | | | * | | change units for smoothing and calligraphic angle in PI | Pushkar Joshi | 2012-06-07 |
| | | | | | | | |||
| | | | | * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-07 |
| | | | | |\ \ | |||
| | | | | * | | | change the PI to make it look like the fill color affects the brush stroke color | Pushkar Joshi | 2012-06-07 |
| | | | | | | | | |||
| | | | | * | | | enable gradients for brush stroke (in authoring as well as runtime) | Pushkar Joshi | 2012-06-06 |
| | | | | | | | | |||
| | | | | * | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js | ||
| | | | | * \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| | | | | |\ \ \ \ | |||
| | | | | * | | | | | removed repeated declarations in brush stroke runtime class | Pushkar Joshi | 2012-06-04 |
| | | | | | | | | | | |||
| | | | | * | | | | | runtime version of the brush stroke (similar to the pen paths, this seems to ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work unless we run it through the debugger) | ||
| | | | | * | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-05-31 |
| | | | | |\ \ \ \ \ | |||
| | | | | * \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-05-22 |
| | | | | |\ \ \ \ \ \ | |||
| | | | | * \ \ \ \ \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-05-22 |
| | | | | |\ \ \ \ \ \ \ | |||
| | | | * | \ \ \ \ \ \ \ | Merge pull request #283 from mqg734/BodyPI | Valerio Virgillito | 2012-06-07 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Body PI fixes. | ||
| | | | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into BodyPI | Nivesh Rajbhandari | 2012-06-07 |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | * | | | | | | | | | | Body PI fixes. | Nivesh Rajbhandari | 2012-06-07 |
| | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | | | | | | | Merge pull request #281 from joseeight/FileIO | Valerio Virgillito | 2012-06-07 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | Adding partial unique ID to data files | ||
| | | | | * | | | | | | | | | Fixing empty property bug with montage class on HTML tag | Jose Antonio Marquez | 2012-06-07 |
| | | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | | Minor fixes | Jose Antonio Marquez | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensuring montage style is removed and doctype is included. | ||
| | | | | * | | | | | | | | | Adding support for html and head tags attributes | Jose Antonio Marquez | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both on open and close, Chrome randomly changes order of attributes, so this is browser induced bug. | ||
| | | | | * | | | | | | | | | Fixing unique ID store | Jose Antonio Marquez | 2012-06-07 |
| | | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-06-07 |
| | | | | |\| | | | | | | | | |||
| | | | | * | | | | | | | | | Adding unique ID to canvas data folders | Jose Antonio Marquez | 2012-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-fix | Valerio Virgillito | 2012-06-07 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | fixing the body color chip for non banners templates | ||
| | | | | * | | | | | | | | fixing the body color chip for non banners templates | Valerio Virgillito | 2012-06-07 |
| | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | | | | | Merge pull request #275 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-07 |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | Element model fixes and selection fixes | ||
| | | | | * | | | | | | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |||