| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
| |\ | | | | | | | integration | ||
| | * | Cleaning up requires | Jose Antonio Marquez | 2012-02-14 |
| | | | |||
| | * | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| | |\ | |||
| | | * | save integration - minor bug fix | 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 |
| | | |\ | |||
| | | * | | integrating save functionality | Ananya Sen | 2012-02-13 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | 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 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | | 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 branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| | |\ \ \ \ \ | |||
| | * | | | | | | 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 | ||
| | * | | | | | | | Cleaning up open file in code view | Jose Antonio Marquez | 2012-02-10 |
| | | | | | | | | | |||
| | * | | | | | | | Adding back file open for code view | Jose Antonio Marquez | 2012-02-10 |
| | | | | | | | | | |||
| | * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | ||
| | * | | | | | | | | File Open | Jose Antonio Marquez | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the functionality to open a basic file. | ||
| | * | | | | | | | | Merge pull request #6 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-10 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | Open file fixes and adding opening in code view. | ||
| | | * | | | | | | | hide iframeContainer if we want to open code view as the first document ↵ | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after ninja launches Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | removed temporary test to open ninja without default document, since it is ↵ | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breaking other things. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-10 |
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/document/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | Adding download cloud app UI | Jose Antonio Marquez | 2012-02-09 |
| | | | | | | | | | | |||
| | * | | | | | | | | New/Open HTML document parsing | Jose Antonio Marquez | 2012-02-09 |
| | | | | | | | | | | |||
| | * | | | | | | | | Merge pull request #5 from mencio/file-io | Jose Antonio Marquez Russo | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | FileIO - Disable auto opening a file | ||
| | | * | | | | | | | | disabling the auto open of a document on load. Temporary using the new ↵ | Valerio Virgillito | 2012-02-09 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project button to open a document. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * / / / / / / | file open and file new integrated again | 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-09 |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | File Open | Jose Antonio Marquez | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding file open functionality. | ||
| | * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/fileio.js js/mediators/io-mediator.js | ||
| | | * | | | | | | | | | fixed templates descriptor, changed validation to on key up, fixed minor ui ↵ | Ananya Sen | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: index.html | ||
| | * | | | | | | | | | | | New File | Jose Antonio Marquez | 2012-02-09 |
| | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | |||