Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-05-31 |
|\ | |||
| * | change the behavior of what happens when alt is pressed while moving anchor ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | handles (the behavior now matches the design) | ||
| * | somewhat working version of the canvas runtime for pen paths (the runtime ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | renders properly if we go through debugger)...also removed calls to getStageElement from pen tool | ||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
| |\ | |||
| | * | Merge pull request #261 from ericguzman/CSSPanelUpdates | Valerio Virgillito | 2012-05-31 |
| | |\ | | | | | | | | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObject | ||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-05-30 |
| | | |\ | | | | | | | | | | | | | | | | CSSPanelUpdates | ||
| | | * | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObject | Eric Guzman | 2012-05-30 |
| | | | | | |||
| | | * | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-29 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates | ||
| | | * | | | CSS Panel - Handle focus after editing selector | Eric Guzman | 2012-05-29 |
| | | | | | | |||
| | | * | | | CSS Panel - Find correct previously-rendered rule list after selection. | Eric Guzman | 2012-05-29 |
| | | | | | | |||
| | | * | | | CSS Panel - Prevent Animation on New Style | Eric Guzman | 2012-05-27 |
| | | | | | | |||
| | * | | | | updating the google components serialization to enable saving | Valerio Virgillito | 2012-05-31 |
| | | |_|/ | | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | updating to version 0.6 | Valerio Virgillito | 2012-05-30 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge pull request #260 from joseeight/Document | Valerio Virgillito | 2012-05-30 |
| | |\ \ \ | | | |_|/ | | |/| | | Document | ||
| | | * | | Merge pull request #35 from aadsm/Document | Jose Antonio Marquez Russo | 2012-05-30 |
| | |/| | | | | | | | | | | | | Bug fixes to template creator | ||
| | | * | | Initialize an internal Template variable in TemplateCreator | António Afonso | 2012-05-30 |
| | | | | | |||
| | | * | | Stop serializing the child components of the top components are not serialized | António Afonso | 2012-05-30 |
| | | | | | | | | | | | | | | | We just removed them before serializing and add them again afterwards. | ||
| | | * | | Stop adding ids to elements in template creator | António Afonso | 2012-05-30 |
| | | | | | | | | | | | | | | | | | | | | This is the fix for Motorola-Mobility/montage#648 | ||
| | | * | | Avoid duplicate labels in template creator | António Afonso | 2012-05-30 |
| | |/ / | | | | | | | | | This is the fix for Motorola-Mobility/montage#649 | ||
| | * | | Merge pull request #257 from joseeight/Document | Valerio Virgillito | 2012-05-28 |
| | |\ \ | | | | | | | | | | | Cleaning and tidying up. | ||
| | | * \ | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-28 |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-25 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | * | | | | fix for the id and class controls in the pi | Valerio Virgillito | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the id and class did not set values from the pi because of the removals of all id's on element. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | | | | | | |||
| | | | * | | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | | | | | | |||
| | | | * | | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | | |/ / | |||
| | | * | | Merge pull request #256 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-24 |
| | |/| | | | | | | | | | | | | IKNinja-1621 - 3D stage does not reset correctly when the rotation point is set elsewhere on stage. | ||
| | | * | | IKNinja-1621 - 3D stage does not reset correctly when the rotation point is ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set elsewhere on stage. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge pull request #255 from joseeight/Document | Valerio Virgillito | 2012-05-24 |
| | |\ \ \ | | | | | | | | | | | | | Cleaning up referencing to documentRoot | ||
| | | * | | | Final clean up of render callback for design view | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | |||
| | | * | | | 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 | ||
| | * | | | | Merge pull request #254 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-24 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | Updates to stage code for handling multiple document workflow. | ||
| | | * | | | Getter for _liveNodeList should return a copy. | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Removed unused variables and methods in stage-deps, layout design, and ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snap-manager. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Fixed selection bug when switching/opening documents. Also, use saved scroll ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | 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> | ||
| | | * | | | Update stage to handle switching between documents. | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-23 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | adding document views checks for the timeline and breadcrumb | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | fixing the styles manager to open code view files and closing the last document. | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge pull request #253 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-23 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Fixing triggerBinding warning from timeline panel. | ||
| | * \ \ \ \ | Merge pull request #252 from ananyasen/dom-architecture | Valerio Virgillito | 2012-05-23 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | bug fixes | ||
| | | * | | | | | - removed redundant change | Ananya Sen | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed js error on click of splitters when no documents are open Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/master-dom-architecture' into dom-architecture | Ananya Sen | 2012-05-22 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | - 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> | ||
| | | | | | * | | | Fixed scrolling and centering stage code. Also, moved liveNodeList into the ↵ | Nivesh Rajbhandari | 2012-05-23 |
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | design view and added an option to exclude styles and text nodes when retrieving the live nodes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | * | | | Timeline triggerBinding needs to be set to false in the track data. | Nivesh Rajbhandari | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | | * | | Some clean up, adding comments | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This obviously needs much work and reworking... | ||
| | | | | | * | | Renaming variable as it will now be used | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer a temp fix, it might be a permanent boolean to open/close web-request API gates. | ||
| | | | | | * | | Fixing reference of document | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | |