Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-27 |
|\ | |||
| * | Merge pull request #19 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-24 |
| |\ | | | | | | | FileIO branch pull request | ||
| * | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | - save show3DGrid flag per document while switching documents | Ananya Sen | 2012-02-27 |
| |/ |/| | | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | - added closeDocument event for timeline | Ananya Sen | 2012-02-24 |
|/ | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | fixing the tools shortcuts - IKNINJA 1199 | Valerio Virgillito | 2012-02-23 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | - moved tools specific keyboard controls for desing view only | Ananya Sen | 2012-02-20 |
| | | | | | | - stopped snapping when all documents are closed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-18 |
|\ | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Chrome Preview | Jose Antonio Marquez | 2012-02-17 |
| | | |||
* | | doc.markEdited() removed from element-mediator, for style changes, as per ↵ | Ananya Sen | 2012-02-18 |
| | | | | | | | | | | | | teams suggestion Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | -added keyboard control for saving documents | Ananya Sen | 2012-02-17 |
|/ | | | | | | -mark html design view when element is added or deleted Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
|\ | |||
| * | Fixing keyboard shortcut and tooltip for hand and 3d tools. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |