| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | File IO UI tweaks | Jose Antonio Marquez | 2012-02-13 |
| | | | | | Making minor tweaks to the UI for file IO, will need to make much more at a later time. | ||
| * | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ | |||
| | * | new file dialog - preselect default template | Ananya Sen | 2012-02-13 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | added logical drive selection to file picker | Ananya Sen | 2012-02-13 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| | |\ | |||
| | * \ | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| | |\ \ | |||
| * | \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ | |_|_|/ |/| | | | |||
| | * | | | Merge pull request #39 from mencio/montage-overrides | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ | | | | | | | | | | | Adding a montage override sass file. Overriding the default css for montage popups. | ||
| | | * | | | Adding a montage override sass file. Overriding the default css for montage ↵ | Valerio Virgillito | 2012-02-13 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | popups. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Fixing multiple tabs | Jose Antonio Marquez | 2012-02-13 |
| | | | | | | | | | | | | | | | | | Fixed broken code to allow for multiple tabs to open. | ||
| * | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ | | |/ / | |/| | | |||
| | * | | | Revert "Merge from /joseeight/ninja-internal/tree/FileIO" | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge from /joseeight/ninja-internal/tree/FileIO | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | show iframeContainer if all documents are closed | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||
| | * | | Merge pull request #38 from ericguzman/StylesControllerUpdates | Valerio Virgillito | 2012-02-13 |
| | |\ \ | | | | | | | | | Styles controller updates | ||
| | | * \ | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-13 |
| | | |\ \ | | |/ / | |/| | | | | | | | | | | Conflicts: js/controllers/styles-controller.js | ||
| | * | | | Merge pull request #37 from mencio/stage-color | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ | | | | | | | | | | | Stage color: Adding the stage background color chip to the stage PI | ||
| | | * \ \ | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| | | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| | | |\ \ \ | |||
| | | * | | | | Cleaning up the stage background color chip. | Valerio Virgillito | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Valerio Virgillito | 2012-02-12 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | stage-color | ||
| | | * | | | | | initial color chip for the stage | Valerio Virgillito | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | | * | | Styles Controller - Separate css animation rule getters | Eric Guzman | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To add document- and sheet-specific getters. | ||
| | | | | | * | | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-08 |
| | | | | | |\ \ | |||
| | | | | | * | | | Styles Controller - added methods to get keyframe animation rules | Eric Guzman | 2012-02-08 |
| | | | | | | | | | |||
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge pull request #36 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Final Splash Screen Art | ||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-13 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | WorkingBranch | ||
| | | * | | | | | | | implemented finalized splash screen | John Mayhew | 2012-02-13 |
| | | | | | | | | | | |||
| | * | | | | | | | | Merge pull request #34 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | Tree components - updating the ninja branch/leaf | ||
| | | * | | | | | | | Ninja leaf - remove console lot | Eric Guzman | 2012-02-13 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'refs/heads/master' into TreeComponents | Eric Guzman | 2012-02-13 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||
| | | * | | | | | | | Tree Components - Change the way delegate methods are called | Eric Guzman | 2012-02-13 |
| | | | | | | | | | | |||
| * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\| | | | | | | | | |||
| | * | | | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-13 |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144 | ||
| * | | | | | | | | Save 'code' view files | Jose Antonio Marquez | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added functionality (temp) to save files in code view. | ||
| * | | | | | | | | File Save (with CSS styles) | Jose Antonio Marquez | 2012-02-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temp fix for saving styles in <style> of HTML document. | ||
| * | | | | | | | | File Save (HTML only) | Jose Antonio Marquez | 2012-02-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file. | ||
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | ||
| | * | | | | | | | Merge pull request #32 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-10 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | Updates for splash screen, menu items and implemented some of the new help menu items | ||
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-10 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | WorkingBranch | ||
| | * | | | | | | | Merge pull request #31 from mqg734/WebGLFixes | Valerio Virgillito | 2012-02-10 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merging WebGL fixes | ||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-10 |
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | | * | | | | | | | Support export/import of GLLine data. | Nivesh Rajbhandari | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | Removing some console logs. I kept in the ones that signify error cases. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | Fixed switching between webGL and canvas 2d modes. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | Updated linear and radial gradient materials import/export routines. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | Merging changes for rectangle drawing. | Nivesh Rajbhandari | 2012-02-09 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | |||