aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-31
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * fix doc model in prop trackJonathan Duran2012-05-31
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-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>
| | * updating to version 0.6Valerio Virgillito2012-05-30
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge pull request #260 from joseeight/DocumentValerio Virgillito2012-05-30
| | |\ | | | | | | | | Document
| | | * Merge pull request #35 from aadsm/DocumentJose Antonio Marquez Russo2012-05-30
| | |/| | | | | | | | | Bug fixes to template creator
| | | * Initialize an internal Template variable in TemplateCreatorAntónio Afonso2012-05-30
| | | |
| | | * Stop serializing the child components of the top components are not serializedAntónio Afonso2012-05-30
| | | | | | | | | | | | We just removed them before serializing and add them again afterwards.
| | | * Stop adding ids to elements in template creatorAntónio Afonso2012-05-30
| | | | | | | | | | | | | | | | This is the fix for Motorola-Mobility/montage#648
| | | * Avoid duplicate labels in template creatorAntónio Afonso2012-05-30
| | |/ | | | | | | This is the fix for Motorola-Mobility/montage#649
| | * Merge pull request #257 from joseeight/DocumentValerio Virgillito2012-05-28
| | |\ | | | | | | | | Cleaning and tidying up.
| | | * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-28
| | | |\ | | | |/ | | |/|
| | * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-25
| | |\ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * | | fix for the id and class controls in the piValerio Virgillito2012-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 upJose Antonio Marquez2012-05-27
| | | | |
| | | | * Cleaning upJose Antonio Marquez2012-05-27
| | | | |
| | | | * Cleaning upJose Antonio Marquez2012-05-27
| | | |/
| | | * Merge pull request #256 from mqg734/Dom-ArchitectureValerio Virgillito2012-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 Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | set elsewhere on stage. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge pull request #255 from joseeight/DocumentValerio Virgillito2012-05-24
| | |\ \ | | | | | | | | | | Cleaning up referencing to documentRoot
| | | * | Final clean up of render callback for design viewJose Antonio Marquez2012-05-24
| | | | |
| | | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-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-ArchitectureValerio Virgillito2012-05-24
| | |\ \ \ | | | | |/ | | | |/| Updates to stage code for handling multiple document workflow.
| | | * | Getter for _liveNodeList should return a copy.Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Removed unused variables and methods in stage-deps, layout design, and ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snap-manager. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixed selection bug when switching/opening documents. Also, use saved scroll ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check updated document model. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Update stage to handle switching between documents.Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-23
| | | |\ \ | | | |/ / | | |/| |
| | * | | adding document views checks for the timeline and breadcrumbValerio Virgillito2012-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 Virgillito2012-05-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge pull request #253 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-23
| | |\ \ \ | | | | | | | | | | | | Fixing triggerBinding warning from timeline panel.
| | * \ \ \ Merge pull request #252 from ananyasen/dom-architectureValerio Virgillito2012-05-23
| | |\ \ \ \ | | | | | | | | | | | | | | bug fixes
| | | * | | | - removed redundant changeAnanya Sen2012-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-architectureAnanya Sen2012-05-22
| | | |\ \ \ \
| | | * | | | | - don't redraw stage for code document - fixes a switching bugAnanya Sen2012-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 Rajbhandari2012-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 Rajbhandari2012-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | | * Some clean up, adding commentsJose Antonio Marquez2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This obviously needs much work and reworking...
| | | | | | * Renaming variable as it will now be usedJose Antonio Marquez2012-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 documentJose Antonio Marquez2012-05-24
| | | | | | |
| | | | | | * Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-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 DocumentJose Antonio Marquez2012-05-23
| | | | | | |\ | | | |_|_|_|/ | | |/| | | |
| | * | | | | improve the closing of documents.Valerio Virgillito2012-05-23
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | minor formatting fixesValerio Virgillito2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge pull request #251 from ericguzman/CSSPanelUpdatesValerio Virgillito2012-05-22
| | |\ \ \ \ | | | |_|/ / | | |/| | | Css panel updates
| | | * | | Style Sheets - Remove duplicate class name from stylesheets toolbarEric Guzman2012-05-22
| | | | | |
| | | * | | CSS Panel - Merged Styles controller from DOM ArchitectureEric Guzman2012-05-22
| | | | | |
| | | * | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-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 Guzman2012-05-22
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 11:42:15 +0000