| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-11 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-11 |
| | |\ | |||
| | | * | Merge pull request #286 from mqg734/ScrollBarFix | Valerio Virgillito | 2012-06-11 |
| | | |\ | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white. | ||
| | | | * | Merge branch 'refs/heads/ninja-internal' into ScrollBarFix | Nivesh Rajbhandari | 2012-06-08 |
| | | | |\ | |||
| | | | * | | Overriding scrollbar styles on the template so the scroll track is not ↵ | Nivesh Rajbhandari | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | white. This has the side benefit of fixing some of the zoom issues with the scrollbar too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Re-adding temp doc type | Jose Antonio Marquez | 2012-06-09 |
| | | | |/ | | |/| | | | | | | | | | Adding a demo fix to include the document type, it is removed because comments are not supported currently, so we must added in manually. The YouTube component breaks, it does not support any doctype, hence, the component must have a bug filed against it, we MUST include doc types with our files. | ||
| | | * | | 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 | ||
| | | | * | | 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 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. | ||
| | | * | | | | fixing the body color chip for non banners templates | Valerio Virgillito | 2012-06-07 |
| | | | |/ / | | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | 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 |
| | | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | / | | | | | |_|/ | | | | |/| | | Pentool | ||
| | | | | * | | | added gradients to pen path runtime | Pushkar Joshi | 2012-06-06 |
| | | | | | | | | |||
| | | | | * | | | updated the ninja library version (now contains brushstroke and pen path ↵ | Pushkar Joshi | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendering) | ||
| | | | | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-05 |
| | | | | |\ \ \ | |||
| | | | | * | | | | handle switching between multiple documents for Pen tool by having its own ↵ | Pushkar Joshi | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection change handler | ||
| | | | | * | | | | enable gradients for pen stroke and fill | Pushkar Joshi | 2012-06-05 |
| | | | | | | | | | |||
| | | | | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-04 |
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | | | | * | | | | | change the behavior of what happens when alt is pressed while moving anchor ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | |||