Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-05 |
|\ | |||
| * | Adding saving blocking screen | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview. | ||
| * | Adding lib copy blocking to preview | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | This fixes an issue with launching preview before libraries were copied, hence, first time run would fail. Need to add a feedback screen for this process. | ||
| * | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-04 |
| |\ | |||
| * | | Creating template mediator class | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | This is to simplify code, more to be changed and added. | ||
* | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-04 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: js/tools/PenTool.js | ||
| * | | Merge branch 'refs/heads/master' into document-bindings-fix | Valerio Virgillito | 2012-06-01 |
| |\| | |||
| | * | Fixing CSS overwrite issue | Jose Antonio Marquez | 2012-05-30 |
| | | | |||
| | * | Attempting to track clean nodes | Jose Antonio Marquez | 2012-05-30 |
| | | | | | | | | | | | | Need to figure out CSS overwrite issue <style> | ||
| * | | document bindings phase 1 | Valerio Virgillito | 2012-05-29 |
| |/ | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
|\| | |||
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| | * | Keyboard arrows were not working because some code had not been updated to ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | check updated document model. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | - don't redraw stage for code document - fixes a switching bug | Ananya Sen | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | - fix for ctrl+S for code document - disallow opening the panels while in code document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| |/ | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
| * | Maintain I/O webGL mode fix | Jose Antonio Marquez | 2012-05-22 |
| | | | | | | | | Keeping data in-file if a data tag is detected. | ||
| * | Fixing localization bug with webgl external data | Jose Antonio Marquez | 2012-05-21 |
| | | |||
| * | Modifying Canvas Data I/O | Jose Antonio Marquez | 2012-05-21 |
| | | | | | | | | Changing methods to save all data to external files, this will be optional for the user. Currently save will only save to external files, but UI will allow user to save in file. Need to implement loading data on file open for external file, only works for in file currently. Modified the Runtime file to load all data itself to not bulk up the user document. | ||
| * | Adding mappings to Google Components | Jose Antonio Marquez | 2012-05-21 |
| | | | | | | | | This is just to add correct mappings to Google Montage components in the package.json file generated. | ||
| * | Fixing save logic | Jose Antonio Marquez | 2012-05-18 |
| | | | | | | | | Moved dirty marker clearing code to model. | ||
| * | Adding component initialization on open | Jose Antonio Marquez | 2012-05-17 |
| | | | | | | | | This is for opening components, selection is still not reflecting component data. | ||
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| |\ | |||
| | * | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| |\| | | |||
| | * | | changing @change to propertyChangeListener | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Fixing serialization referencing (new object per save) | Jose Antonio Marquez | 2012-05-16 |
| | | | | |||
| * | | | Fixing reference to serialization tag | Jose Antonio Marquez | 2012-05-16 |
| | | | | |||
| * | | | Adding basic montage components I/O | Jose Antonio Marquez | 2012-05-16 |
| |/ / | | | | | | | | | | Only for saving basic components without a reel. | ||
| * | | Fixing preview bug | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | | | | | | Also setting up for Montage component serialization. | ||
| * | | Saving body attributes | Jose Antonio Marquez | 2012-05-15 |
| | | | |||
| * | | File save for banner template | Jose Antonio Marquez | 2012-05-15 |
| | | | | | | | | | | | | Adding file save for templates, completing I/O. | ||
| * | | 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. | ||
| * | | Fixing 3d to work in banner templates. | Nivesh Rajbhandari | 2012-05-14 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Fixing overflow bug for banner templates | Jose Antonio Marquez | 2012-05-11 |
| | | | | | | | | | | | | Ensuring overflow is visible but saved as hidden. | ||
| * | | 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. | ||
| * | | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵ | Valerio Virgillito | 2012-05-10 |
| | | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Temp removing montage clean up | Jose Antonio Marquez | 2012-05-09 |
| | | | |||
| * | | Preliminary Montage Template Cleanup | Jose Antonio Marquez | 2012-05-09 |
| | | | | | | | | | | | | The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save. | ||
| * | | 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... | ||
| * | | Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵ | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | | | | | | | | | | | still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 |
| |\ \ | |||
| * \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-03 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-24 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | Clean up | Jose Antonio Marquez | 2012-04-19 |
| | | | | | | | | |||
* | | | | | | | | allow changes in the pen subtool in options to be seen by the pen tool code ↵ | Pushkar Joshi | 2012-05-22 |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool | ||
* | | | | | | | fixed bug with keyboard shortcut for fill/ink tool | John Mayhew | 2012-05-16 |
| | | | | | | | |||
* | | | | | | | Removed unused SubSelect Tool | John Mayhew | 2012-05-08 |
| | | | | | | |