aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\
| * Fixing apply 'no color'Jose Antonio Marquez2012-06-15
* | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\|
| * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\
| | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| | |\
| | * | remove serializable from custom sectionValerio Virgillito2012-06-12
| | * | adding more nonexistent propertiesValerio Virgillito2012-06-12
| | * | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | |\ \
| | * | | first iteration of adding serializable to ninja plus other changes to run the...Valerio Virgillito2012-06-06
| * | | | We need to guard against cases where some PI controls are using HottextUnit b...Nivesh Rajbhandari2012-06-13
| * | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixing typo.Nivesh Rajbhandari2012-06-11
| | * | | Removing unused requires from 3d PI section.Nivesh Rajbhandari2012-06-11
| | * | | IKNinja-1377 - Global rotation does not work if object is translated in z.Nivesh Rajbhandari2012-06-11
| | | |/ | | |/|
| * / | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| |/ /
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
|\| |
| * | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| |/
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
|\|
| * fixing selection when switching documentsValerio Virgillito2012-05-31
| * fixing the closing of documentsValerio Virgillito2012-05-30
| * Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into...Valerio Virgillito2012-05-30
| |\
| | * PI's 3d section was not binding correctly to the current document.Nivesh Rajbhandari2012-05-30
| * | fixing the timeline current document bindingsValerio Virgillito2012-05-30
| |/
| * Fixing the close document.Valerio Virgillito2012-05-30
| * document bindings phase 1Valerio Virgillito2012-05-29
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\|
| * fix for the id and class controls in the piValerio Virgillito2012-05-25
| * Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| * fixing the undefined 'color' issueValerio Virgillito2012-05-22
| * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-18
| |\
| | * fixing the color chip for the document rootValerio Virgillito2012-05-18
| * | Fixing radio control in the PI.Nivesh Rajbhandari2012-05-18
| * | Fixing button controls in the Properties Panel for changes in montage v.10 dr...Nivesh Rajbhandari2012-05-18
| |/
| * enabling basic document switchingValerio Virgillito2012-05-18
| * Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| |\
| * | adding a null check.Valerio Virgillito2012-05-16
| * | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Valerio Virgillito2012-05-16
| |\ \
| | * | renaming the position and size componentValerio Virgillito2012-05-15
| | * | reverting a pi width changeValerio Virgillito2012-05-14
| | * | fixing the body piValerio Virgillito2012-05-14
| * | | Removing the old checkbox components. Created a new LabelCheckboxValerio Virgillito2012-05-16
| |/ /
| * | Adding support for new templatesJose Antonio Marquez2012-05-11
| * | Partially fixing the body pi and fixing the selection controllerValerio Virgillito2012-05-10
* | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
|\ \ \
| * | | Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-22
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | fixed bug introduced when we removed the color toolbar. The styling of the co...John Mayhew2012-05-11
| |/
* / Squashed commit of the following:Jonathan Duran2012-05-14
|/
* Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
|\