| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-05-31 |
| |\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | fix doc model in prop track | Jonathan Duran | 2012-05-31 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-31 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | 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> | ||
| | | * | | 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 | ||
| | | | * | 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 |
| | | | | | | | | |||
| | | * | | | | | 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. | ||
| | | * | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-23 |
| | | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||
| | | | * | | | | improve the closing of documents. | Valerio Virgillito | 2012-05-23 |
| | | | |/ / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | minor formatting fixes | Valerio Virgillito | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | Merge pull request #251 from ericguzman/CSSPanelUpdates | Valerio Virgillito | 2012-05-22 |
| | | | |\ \ \ | | | | |_|/ | | | |/| | | Css panel updates | ||
| | | | | * | | Style Sheets - Remove duplicate class name from stylesheets toolbar | Eric Guzman | 2012-05-22 |
| | | | | | | | |||
| | | | | * | | CSS Panel - Merged Styles controller from DOM Architecture | Eric Guzman | 2012-05-22 |
| | | | | | | | |||
| | | | | * | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-22 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/controllers/styles-controller.js | ||
| | | | | * | | | CSS Style - Fix issue when changing value to same value minus units. | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Panel - Fix applying selector to element when selector not changed | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Style Rule - Extract and append class name from selector on first change | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Panel - Update components to use new serialization format | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Panel - Delete un-used components | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Style - Remove drag/drop UI stuff | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Style - turning drag/drop off | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Style - Remove console logs | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Panel - Remove console logs | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Style Declaration - Improve shorthand filtering | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||
| | | | | * | | | CSS Panel - Add Rule - apply new class after use specifies selector | Eric Guzman | 2012-05-22 |
| | | | | | | | | |||