| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 |
| | |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/LineTool.js js/tools/ShapeTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge pull request #276 from mqg734/DrawingTools | Valerio Virgillito | 2012-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 Rajbhandari | 2012-06-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | Merge pull request #274 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-06 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Bugfix master | ||
| | * | | | | | | | | | IKNINJA-1662 - fixed js error while resizing brewing in code view | Ananya Sen | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-05 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | IKNINJA-1645- fix - don't disable OK button on change of file type | Ananya Sen | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | | | | | | | fixing a rotation and zoom bug | Valerio Virgillito | 2012-06-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | | | | | | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| | | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | | Merge pull request #277 from joseeight/Document | Valerio Virgillito | 2012-06-06 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixing referencing, also clean up | ||
| | * | | | | | | | | | | | Cleaning more. | Jose Antonio Marquez | 2012-06-06 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Cleaning up | Jose Antonio Marquez | 2012-06-06 |
| | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later. | ||
| * | | | | | | | | | | | Merge pull request #272 from pushkarjoshi/pentool | Valerio Virgillito | 2012-06-06 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_ | |||