| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-15 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js | |||
| | * | | | | Tree controller - Minor change (to use "distinct" descriptor) | Eric Guzman | 2012-02-15 | |
| | | | | | | ||||
| | * | | | | Tree view event delegate map fix | Eric Guzman | 2012-02-15 | |
| | | | | | | ||||
| | * | | | | 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 | |||
| * | | | | | | | moved file picker in file io | Ananya Sen | 2012-02-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | | | | file picker: | Ananya Sen | 2012-02-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable ok if user double clicks folder and enter it. Validate path if user enter it manually in addressbar. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | | | | fixes to document tabbing | Ananya Sen | 2012-02-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | | | | Revert "Revert "Reverting text/html document classes and setting up MVC ↵ | Ananya Sen | 2012-02-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | | | | Revert "Reverting text/html document classes and setting up MVC folder ↵ | Ananya Sen | 2012-02-15 | |
| | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | | | Reverting text/html document classes and setting up MVC folder structure | Jose Antonio Marquez | 2012-02-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers. | |||
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-14 | |
| |\| | | | | | |/ / / / |/| | | | | ||||
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-14 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | WorkingBranch | |||
| | * | | | | Implemented about box component and hooked it up to the About menu | John Mayhew | 2012-02-14 | |
| | | |_|/ | |/| | | ||||
| * | | | | 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/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> | |||
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 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 | |||
| * | | | | | 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 | |||
| | * | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | feature-branch | |||
| | | * | | | More Text Tool Updates | Armen Kesablyan | 2012-02-09 | |
| | | | | | | ||||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Armen Kesablyan | 2012-02-07 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css | |||
| | | * | | | | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 | |
| | | | | | | | ||||
| | | * | | | | Initial Text tool completion. | Armen Kesablyan | 2012-02-07 | |
| | | | | | | | ||||
| | * | | | | | Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ↵ | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | feature-branch | |||
| | | * | | | | | Removing the un-used package.json | Valerio Virgillito | 2012-02-09 | |
| | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||