Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-18 |
|\ | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| * | Fixing save logic | Jose Antonio Marquez | 2012-05-18 |
| | | | | | | | | Moved dirty marker clearing code to model. | ||
* | | fixing the color chip for the document root | Valerio Virgillito | 2012-05-18 |
|/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | fixed a switch documents bug where the layout was getting called before ↵ | Valerio Virgillito | 2012-05-18 |
| | | | | | | setting the container. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Fixing the save as paths | Valerio Virgillito | 2012-05-18 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | enabling basic document switching | Valerio Virgillito | 2012-05-18 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | multiple documents - enable opening multiple documents and initial switching | Valerio Virgillito | 2012-05-17 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | document controller and stage view code cleanup | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | code cleanup and refactoring of the document controller and stage view | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | clearing the needs save flag on save. | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | removing first draw on the component event | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | fixed some binding warnings | Valerio Virgillito | 2012-05-15 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | document close handler. initial working draft | Valerio Virgillito | 2012-05-15 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-14 |
|\ | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-14 |
| |\ | |||
| | * | Merge pull request #226 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-14 |
| | |\ | | | | | | | | | Fixing 3d to work in banner templates. | ||
| | * | | Fixing webRequest URL parsing | Jose Antonio Marquez | 2012-05-14 |
| | | | | |||
| * | | | Viewport for banner templates so content doesn't push through "body". | Nivesh Rajbhandari | 2012-05-14 |
| | |/ | |/| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Fixing 3d to work in banner templates. | Nivesh Rajbhandari | 2012-05-14 |
| |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* / | code cleanup | Valerio Virgillito | 2012-05-14 |
|/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Adding support for new templates | Jose Antonio Marquez | 2012-05-11 |
| | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template. | ||
* | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵ | Valerio Virgillito | 2012-05-10 |
| | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Adding webRequest API | Jose Antonio Marquez | 2012-05-10 |
| | | | | Adding webRequest API to handle local URLs intercepting. Should be a temp fix. | ||
* | Adding partial close functionality | Jose Antonio Marquez | 2012-05-10 |
| | |||
* | Adding support to save body's css styles on preview. | Nivesh Rajbhandari | 2012-05-09 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-08 |
|\ | |||
| * | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 |
| |\ | |||
| | * | fixed javascript errors | Ananya Sen | 2012-05-07 |
| | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | | Adding SAVE for I/O | Jose Antonio Marquez | 2012-05-08 |
|/ / | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up... | ||
* | | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 |
| | | |||
* | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 |
|\| | |||
| * | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
| |\ | |||
| * \ | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | - collapse panels for code view, restore for design view | Ananya Sen | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-17 |
| |\ \ \ | |||
| * | | | | - code editor view options bar | Ananya Sen | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete - font zoom hottext Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | | | | Preliminary IO to new DOM view | Jose Antonio Marquez | 2012-05-01 |
| |_|_|/ |/| | | | |||
* | | | | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 |
| |_|/ |/| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | typo fix | Valerio Virgillito | 2012-04-19 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| |/ |/| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge pull request #153 from mencio/components | Valerio Virgillito | 2012-04-05 |
|\ \ | | | | | | | Components panel cleanup and displaying only simple properties. | ||
| * | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 |
| |\| | |||
| * | | removed trace statement | Valerio Virgillito | 2012-03-27 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | [CR] Keep Save related menu items always enabled, if there is an open document | Ananya Sen | 2012-04-04 |
| |/ |/| | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
|\ \ | |/ |/| | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| * | - enable/disable save, saveAs, saveAll, close, closeAll as per documents open | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
|\ \ | | | | | | | | | | FileIO-Montage-Components | ||
| * | | Changes to the webrequest blocking and adding a google.com permission workaround | Valerio Virgillito | 2012-03-21 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> |