Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Ninja Leaf/Branch - Minor CSS fixes | Eric Guzman | 2012-02-15 |
| | |||
* | Tree Node - fix for applying tree child nodes array twice (and getting ↵ | Eric Guzman | 2012-02-15 |
| | | | | duplicates) | ||
* | Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
|\ | | | | | | | | | | | | | | | | | integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | small changes to the tree component to allow events to be passed and add a ↵ | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | double click handler Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
|\ \ | | | | | | | | | | integration | ||
| * | | Merge branch 'refs/heads/master' into text-tool | Armen Kesablyan | 2012-02-14 |
| |\| | |||
| * | | Merge branch 'refs/heads/master' into text-tool | Armen Kesablyan | 2012-02-13 |
| |\ \ | |||
| * | | | Fixed binding to font size dropdown | Armen Kesablyan | 2012-02-13 |
| | | | | |||
| * | | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵ | Armen Kesablyan | 2012-02-13 |
| | | | | | | | | | | | | | | | | and numbered now bound to text tool | ||
* | | | | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
|\ \ \ \ | | | | | | | | | | | | | | | | integration | ||
| * | | | | 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. | ||
| * | | | | 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 '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 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | 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 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 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | 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-08 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-08 |
| |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-07 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | Adding logic to copy ninja libraries | Jose Antonio Marquez | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up the logic to handling copying ninja required libraries into the app local file system sandbox to be used by cloud simulator. | ||
| * | | | | | | | | | | | | fixed undo/redo for each code view document, changed new file integration ↵ | Ananya Sen | 2012-02-08 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with io mediator Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | | | changes to show document dirty indicator on editing code view, and to remove ↵ | Ananya Sen | 2012-02-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dirty indicator on save. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | | | added editor tab save while switching code view tabs, | Ananya Sen | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integrated new file dialog with io mediator to open the new file in a new tab Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | | | removed using montage button, since it has changed in Montafe 0.6 | Ananya Sen | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||
| * | | | | | | | | | | | | refactoring some file names and locations, | Ananya Sen | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change made to maintain only one codemirror div. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | | | | changes to open multiple code view tabs and switch between the code views, ↵ | Ananya Sen | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added nj-skinned css class for the buttons in file picker, new file dialog and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-01 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | Fixing coreIO API referencing | Jose Antonio Marquez | 2012-02-01 |
| | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-01-31 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | Cloud IO Prompt | Jose Antonio Marquez | 2012-01-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up UI for the file IO prompt on initialization of Ninja and whenever a cloud IO call is made and the server is not detected. | ||
| * | | | | | | | | | | | | | | fixed reference to coreioapi | Ananya Sen | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleaning up opening code view tabs Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | | | | | | calling coreioapi.js directly since filesystem.js will be deleted | Ananya Sen | 2012-01-30 |
| | |