aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-31
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-05-22
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-05-22
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | removing console logValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | * | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \