aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
|\
| * Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| |\
| | * Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | |\
| | * | Removing iframeContainer scroll styles since the scrollbars are not drawn in ...Nivesh Rajbhandari2012-06-08
| | * | Overriding scrollbar styles on the template so the scroll track is not white....Nivesh Rajbhandari2012-06-08
| * | | Merge pull request #287 from joseeight/FileIOValerio Virgillito2012-06-11
| |\ \ \ | | |_|/ | |/| |
| | * | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| |/ /
| * | Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| |\ \
| | * | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | |/
| * | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| |\ \
| | * | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | * | 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
| * | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| |\ \ \ | | |_|/ | |/| |
| | * | fix compile error that was preventing non-gradient brush strokes from being r...Pushkar Joshi2012-06-07
| | * | 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 branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | |\ \ \
| | * \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | |\ \ \ \
| | * | | | | removed repeated declarations in brush stroke runtime classPushkar Joshi2012-06-04
| | * | | | | runtime version of the brush stroke (similar to the pen paths, this seems to ...Pushkar Joshi2012-05-31
| | * | | | | 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
* | | | | | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
|/ / / / / / / / /
* | | | | | | | | Merge pull request #283 from mqg734/BodyPIValerio Virgillito2012-06-07
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Body PI fixes.Nivesh Rajbhandari2012-06-07
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #281 from joseeight/FileIOValerio Virgillito2012-06-07
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixing empty property bug with montage class on HTML tagJose Antonio Marquez2012-06-07
| * | | | | | | | | Minor fixesJose Antonio Marquez2012-06-07
| * | | | | | | | | Adding support for html and head tags attributesJose Antonio Marquez2012-06-07
| * | | | | | | | | 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
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #282 from mencio/colorchip-fixValerio Virgillito2012-06-07
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
|/ / / / / / / /
* | | | | | | | Merge pull request #275 from mencio/element-model-fixesValerio Virgillito2012-06-07
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #276 from mqg734/DrawingToolsValerio Virgillito2012-06-06
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not create any tags or shapes with width or height of 0.Nivesh Rajbhandari2012-06-06
* | | | | | | | | Merge pull request #274 from ananyasen/bugfix-masterValerio Virgillito2012-06-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| * | | | | | | | | 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
| | | | * | | | | | | fixing a rotation and zoom bugValerio Virgillito2012-06-06
| | | | * | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 20:10:17 +0000