| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge from /joseeight/ninja-internal/tree/FileIO | 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-08 |
| |\ | |||
| | * | Tree Components - css fixes | Eric Guzman | 2012-02-08 |
| | | | |||
| * | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-03 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/document/document-controller.js js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js js/io/ui/save-as-dialog.reel/save-as-dialog.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | ||
| | | * | Delete unneeded compass log file (IKNINJA 1101). | Jon Reid | 2012-02-01 |
| | | | | | | | | | | | | | | | | Update base styles for better colors on HTML buttons. Change project panel so it shows no project by default. | ||
| * | | | integrated new file dialog with the template descriptor.json and ↵ | Ananya Sen | 2012-02-02 |
| |/ / | | | | | | | | | | | document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-01-31 |
| |\| | | | | | | | | | Conflicts: _scss/compass_app_log.txt | ||
| | * | Added skin for html buttons. | Jon Reid | 2012-01-31 |
| | | | |||
| | * | Fixes to radio button base styles. Comment clean-up. | Jon Reid | 2012-01-27 |
| | | | |||
| * | | Fixes to radio button base styles. Comment clean-up. | Jon Reid | 2012-01-29 |
| | | | |||
| * | | 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> | |||