aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | 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
| | | * | | 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 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.
| | * | | | | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | 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
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/DocumentValerio Virgillito2012-06-06
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixing referencing, also clean up
| | | | * | | | | | Cleaning more.Jose Antonio Marquez2012-06-06
| | | | | | | | | |
| | | | * | | | | | Cleaning upJose Antonio Marquez2012-06-06
| | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later.
| | | * | | | | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | / / | | | | | |_|/ / | | | | |/| | | Pentool
| | | | * | | | added gradients to pen path runtimePushkar Joshi2012-06-06
| | | | | | | |
| | | | * | | | updated the ninja library version (now contains brushstroke and pen path ↵Pushkar Joshi2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendering)
| | | | * | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-05
| | | | |\ \ \ \
| | | | * | | | | handle switching between multiple documents for Pen tool by having its own ↵Pushkar Joshi2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection change handler
| | | | * | | | | enable gradients for pen stroke and fillPushkar Joshi2012-06-05
| | | | | | | | |
| | | | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | | | * | | | | | change the behavior of what happens when alt is pressed while moving anchor ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handles (the behavior now matches the design)
| | | | * | | | | | somewhat working version of the canvas runtime for pen paths (the runtime ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renders properly if we go through debugger)...also removed calls to getStageElement from pen tool
| | | | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | | |\ \ \ \ \ \
| | | | * | | | | | | move all the subpath functions to its prototype, and first version of the ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |