aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fixing the css bugs with montage v11Valerio Virgillito2012-06-18
* fixing the components.Valerio Virgillito2012-06-18
* Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
|\
| * Merge pull request #308 from joseeight/ColorValerio Virgillito2012-06-18
| |\
| | * Fixing binding of alpha slider/hottext in popup with panelJose Antonio Marquez2012-06-18
| | * Cleaning reelJose Antonio Marquez2012-06-17
| | * Cleaning up element referencesJose Antonio Marquez2012-06-17
| | * Tidying up color barJose Antonio Marquez2012-06-17
| | * More cleaning upJose Antonio Marquez2012-06-16
| | * Fixed slider/hottext bindingsJose Antonio Marquez2012-06-16
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| | |\
| | * | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| | * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-14
| | |\ \ \
| | * | | | Cleaning up referencesJose Antonio Marquez2012-06-14
| * | | | | Merge pull request #309 from mqg734/IKNinja_1746Valerio Virgillito2012-06-18
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport.Nivesh Rajbhandari2012-06-15
| | | |_|/ | | |/| |
* | | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
* | | | | montage v11 merge into ninjaValerio Virgillito2012-06-17
|/ / / /
* | | | Merge pull request #306 from mqg734/GIO_FixesValerio Virgillito2012-06-15
|\ \ \ \ | |/ / / |/| | |
| * | | Remove ninja's author-time styles for banner and animation templates on publi...Nivesh Rajbhandari2012-06-14
| * | | Moving location to copy body style attributeJose Antonio Marquez2012-06-14
| * | | Adding clean up for ninja style attributes.Jose Antonio Marquez2012-06-14
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-14
| |\ \ \ | | | |/ | | |/|
| * | | Merge pull request #36 from mqg734/FileIO_JoseJose Antonio Marquez Russo2012-06-14
| |\ \ \
| | * | | Save user's html and body styles and inline body styles for 3d so they don't ...Nivesh Rajbhandari2012-06-14
| |/ / /
* | | | Merge pull request #307 from mencio/youtube-fixValerio Virgillito2012-06-15
|\ \ \ \ | |_|/ / |/| | |
| * | | merging Stuart youtube fixValerio Virgillito2012-06-14
|/ / /
* | | Merge pull request #305 from joseeight/DocumentValerio Virgillito2012-06-14
|\ \ \
| * | | Adding banner templateJose Antonio Marquez2012-06-14
| |/ /
* | | Merge pull request #304 from mqg734/GIO_FixesValerio Virgillito2012-06-14
|\ \ \
| * | | IKNinja-1710 - Boundary box is drawn offset when switching between docs. This...Nivesh Rajbhandari2012-06-14
* | | | Merge pull request #302 from joseeight/ColorValerio Virgillito2012-06-14
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
| * | | Clean upJose Antonio Marquez2012-06-13
| * | | Fix: IKNINJA-1187Jose Antonio Marquez2012-06-13
| * | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | Cleaning up color wheel componentJose Antonio Marquez2012-06-13
* | | | Merge pull request #301 from pushkarjoshi/brushtoolValerio Virgillito2012-06-14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | fix bug #1718 (trying to delete a non-existent canvas)Pushkar Joshi2012-06-13
| * | | fix bug #1704 where small paths/strokes with large stroke width caused a flip...Pushkar Joshi2012-06-13
| * | | correct path resizing in case of stroke width other than 1Pushkar Joshi2012-06-13
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ | | | |/ | | |/|
| * | | fixes bug #1623: middle transform handle causes the brush stroke to have a ze...Pushkar Joshi2012-06-13
* | | | Merge pull request #300 from mqg734/IKNinja_1715Valerio Virgillito2012-06-13
|\ \ \ \ | |_|_|/ |/| | |
| * | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/O...Nivesh Rajbhandari2012-06-13
| | |/ | |/|
* | | Merge pull request #297 from mqg734/PI_HotTextFixesValerio Virgillito2012-06-13
|\ \ \
| * \ \ Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
|\ \ \ \ | | |/ / | |/| |