| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| |\ | | | | | | | | | Conflicts: assets/canvas-runtime.js | ||
| | * | added gradients to pen path runtime | Pushkar Joshi | 2012-06-06 |
| | | | |||
| * | | Merge branch 'pentool' into brushtool | 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 |
| | |\ | |||
| | | * | Merge pull request #271 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\ | | | | | | | | | fixing the save as | ||
| | | | * | fixing the save as | Valerio Virgillito | 2012-06-05 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Merge pull request #270 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\| | | | | | | | | | fixing a small typo | ||
| | | | * | fixing a small typo | Valerio Virgillito | 2012-06-05 |
| | | |/ | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Merge pull request #269 from mencio/save-as-fix | Valerio Virgillito | 2012-06-05 |
| | | |\ | | | | | | | | | fixing the save as | ||
| | | | * | fixing the save as | Valerio Virgillito | 2012-06-05 |
| | | |/ | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Merge pull request #268 from mqg734/CompassLocation | Valerio Virgillito | 2012-06-05 |
| | | |\ | | | | | | | | | Compass should draw in lower-left regardless of the stage height. | ||
| | | | * | Compass should draw in lower-left regardless of the stage height. | Nivesh Rajbhandari | 2012-06-05 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Merge pull request #263 from joseeight/Components | Valerio Virgillito | 2012-06-05 |
| | | |\ \ | | | |/ | | |/| | Saving Google Components (reel components) | ||
| | | | * | Fixing CSS bug | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | This is for files using 'save' and not 'save all' in which the styles would be thrown off and mixed improperly. | ||
| | | | * | Canvas lib fix | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | Fixed a bug where an extra tag would be added to the file and break I/O. | ||
| | | | * | Adding saving blocking screen | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview. | ||
| | | | * | Fixing saveAll from menu | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | This was broken, not sure when it broke, but working again. | ||
| | | | * | Adding lib copy blocking to preview | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | This fixes an issue with launching preview before libraries were copied, hence, first time run would fail. Need to add a feedback screen for this process. | ||
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-04 |
| | | | |\ | |||
| | | | * | | Adding blocking logic to copy libs | Jose Antonio Marquez | 2012-06-03 |
| | | | | | | | | | | | | | | | | | | | | | Need to implement logic in parsing method, might require a minor restructuring. | ||
| | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | | | |\ \ | |||
| | | | * | | | Adding open draw to reel components | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | |||
| | | | * | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | | | |\ \ \ | |||
| | | | * | | | | Fixing feedread component | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | |||
| | | | * | | | | Add logic to allow dynamic placement of canvas json file | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only) | ||
| | | | * | | | | Map fixes | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | |||
| | | | * | | | | Creating template mediator class | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added. | ||
| | | | * | | | | Fixing Google Map component | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulled in from components branch. | ||
| | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-05-31 |
| | | | |\ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-05-31 |
| | | | |\ \ \ \ \ \ | |||
| | | * | \ \ \ \ \ \ | Merge pull request #266 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | components fix: adding a first draw event to components | ||
| | | | * | | | | | | | | components fix: adding a first draw event to components | Valerio Virgillito | 2012-06-04 |
| | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | | Merge pull request #265 from jreid01/pull-request | Valerio Virgillito | 2012-06-05 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumb interactions | ||
| | | | * | | | | | | | Timeline: Fix line endings, set to UNIX. | Jon Reid | 2012-06-05 |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumb | Jon Reid | 2012-06-04 |
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | interactions under new DOM Architecture. | ||
| | * | | | | | | | | 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 | ||
| | | * | | | | | | | Merge pull request #264 from mencio/document-bindings-fix | Valerio Virgillito | 2012-06-04 |
| | | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | Document bindings fix - Changing the documents architecture to use bindings instead of events | ||
| | | | * | | | | | | fix for the css panel | Valerio Virgillito | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵ | Valerio Virgillito | 2012-06-01 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into document-bindings-fix | ||
| | | | | * \ \ \ \ \ | Merge pull request #8 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-06-01 |
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used a drawing tool yet. | ||
| | | | | | * | | | | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used ↵ | Nivesh Rajbhandari | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a drawing tool yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | | | | | fixing some selection container changes and the breadcrumb not drawing initially | Valerio Virgillito | 2012-06-01 |
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | | | | Merge branch 'refs/heads/master' into document-bindings-fix | Valerio Virgillito | 2012-06-01 |
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||
| | | | * | | | | | | | Merge pull request #7 from mqg734/dom-architecture-pentool | Valerio Virgillito | 2012-06-01 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | Fixed stage's styles not getting initialized correctly and stage rotating too fast. | ||
| | | | | * | | | | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵ | Nivesh Rajbhandari | 2012-06-01 |
| | | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | |||