Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'dom-architecture' of ↵ | Armen Kesablyan | 2012-05-15 |
|\ | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding | ||
| * | Correcting location of Ninja meta data | Jose Antonio Marquez | 2012-05-15 |
| | | | | | | | | Needs to be inside most child div. | ||
| * | Adding animation sub-category to new file | Jose Antonio Marquez | 2012-05-15 |
| | | | | | | | | Adding animation sub-category to template in new file. | ||
| * | Fixing banner template | Jose Antonio Marquez | 2012-05-14 |
| | | | | | | | | Need to implement save, but this cover open and new. | ||
| * | Adding support for new templates | Jose Antonio Marquez | 2012-05-11 |
| | | | | | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template. | ||
| * | Adding support to save body's css styles on preview. | Nivesh Rajbhandari | 2012-05-09 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Adding SAVE for I/O | Jose Antonio Marquez | 2012-05-08 |
| | | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up... | ||
* | | Merge branch 'refs/heads/masterDomArc' into binding | Armen Kesablyan | 2012-05-14 |
|\ \ | |/ |/| | |||
| * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-10 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Squashed commit of google-components into master | Valerio Virgillito | 2012-05-09 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-07 |
| |\| | |||
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-03 |
| |\ \ | |||
| * | | | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵ | Nivesh Rajbhandari | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
|\ \ \ \ | |||
| * \ \ \ | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | Removing more id and changing the appropriate CSS for them | Valerio Virgillito | 2012-05-03 |
| | | |/ | | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Fixing body's default styles. | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
|\| | | | |/ / |/| | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Full CSS support on open | Jose Antonio Marquez | 2012-05-03 |
| | | | | | | | | | | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened. | ||
| * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-27 |
| |\| | |||
| * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 |
| |\ \ | |||
| * | | | Clean up | Jose Antonio Marquez | 2012-04-19 |
| | | | | |||
* | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 |
| | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | |/ | |/| | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
* | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Updating the canvas runtime files for gradient and rectangle radius fixes. | Nivesh Rajbhandari | 2012-04-25 |
| |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* / | IKNINJA-1551 - added editor support for other file types | Ananya Sen | 2012-04-26 |
|/ | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | block filenames and directories with all space | Ananya Sen | 2012-04-06 |
| | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | - using Montage TextField component to handle any edits like keyup, paste, cut. | Ananya Sen | 2012-04-05 |
| | | | | | | - optimized Enter and Esc key handling Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | - disable ok when text box is cleared using backspace and cross, for file ↵ | Ananya Sen | 2012-04-04 |
| | | | | | | name and directory location, in New file and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵ | John Mayhew | 2012-04-03 |
| | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support. | ||
* | updated the rdge compiled version and its runtime, incremented rdge library ↵ | John Mayhew | 2012-04-03 |
| | | | | version number | ||
* | - using clipboard data directly to avoid using setTimeout | Ananya Sen | 2012-03-30 |
| | | | | | | - fixed logical error to trigger OK on Enter key pressed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | detect paste from context menu for new file and save as dialog | Ananya Sen | 2012-03-28 |
| | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
|\ | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| * | KNINJA-1302 : refactored fixed as per request | Ananya Sen | 2012-03-22 |
| | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | IKNINJA-1302 : close on ESC even if text field is focussed | Ananya Sen | 2012-03-22 |
| | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵ | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | path includes the full filename Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | IKNINJA-1361: autofocus and auto-select file name on open of new file and ↵ | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | IKNINJA-1302 : more fix | Ananya Sen | 2012-03-22 |
| | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | file picker - added size unit | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | new file - don't disable OK is file exists Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | IKNINJA-1302 : For File>New and File>SaveAll dialogs, 'ESC' key now ↵ | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | triggers Cancel button and 'Enter' key now triggers OK button. For File picker, the 'ESC' now triggers the Cancel button. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-workflow-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
|\ \ | |||
| * | | Fix: Chrome 19 I/O Bug | Jose Antonio Marquez | 2012-03-21 |
| |/ | | | | | | | Fixed creating new files. | ||
* / | Temp I/O functionality for M-JS components | Jose Antonio Marquez | 2012-03-18 |
|/ | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional. | ||
* | Removing the obsolete modalContainer div. | Valerio Virgillito | 2012-03-14 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Temp Runtime WebGL Fix | Jose Antonio Marquez | 2012-03-10 |
| | | | | Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime. | ||
* | Fixing Issues for Windows Lib | Jose Antonio Marquez | 2012-03-09 |
| |