aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
|\
| * removing first draw on the component eventValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding basic montage components I/OJose Antonio Marquez2012-05-16
|/ | | | Only for saving basic components without a reel.
* adding a null check.Valerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* adding data-montage-id to the componentsValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
|\ | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * renaming the position and size componentValerio Virgillito2012-05-15
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * reverting a pi width changeValerio Virgillito2012-05-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the body piValerio Virgillito2012-05-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-11
| |\ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | fixing the timeline selecting when creating a new layerValerio Virgillito2012-05-11
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Removing the old checkbox components. Created a new LabelCheckboxValerio Virgillito2012-05-16
| |/ |/| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding support for new templatesJose Antonio Marquez2012-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 Virgillito2012-05-10
| | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Partially fixing the body pi and fixing the selection controllerValerio Virgillito2012-05-10
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the components double click center stage position.Valerio Virgillito2012-05-10
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the select and text area PIValerio Virgillito2012-05-10
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* fixing the components for the new domValerio Virgillito2012-05-09
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the color popupValerio Virgillito2012-05-04
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
|\ | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\
| * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | code cleanupValerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Fixing the lock button cssValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| |\ \ \ | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1]
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
| | |\ \ \ \
| | * | | | | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\| | | | | |
| * | | | | | Merge pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Timeline uber
| | * | | | | Timeline: bug fix: disable bread crumb setlevel.Jon Reid2012-04-30
| | | | | | |
| | * | | | | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | | | | | |
| | * | | | | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | | |_|_|/ | | |/| | |
| * / | | | Dom ManipulationKruti Shah2012-05-03
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
|\ \ \ \ \
| * | | | | Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
| |/ / / /
* / / / / Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-04-30
|/ / / / | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \
| * \ \ \ Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 10:14:27 +0000