aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\
| * Update copyright boilerplateKris Kowal2012-07-06
* | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
|/
* Changing the livePreview button to do a chromePreview and keeping the canvas ...Valerio Virgillito2012-06-28
* Fixing IKNINJA-1634Jose Antonio Marquez2012-06-27
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
|\
| * Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\
| | * Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | * Hintable - Remove overridden methodEric Guzman2012-06-21
| | * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| | |\
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| | | |\
| | * | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
| | * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| |
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \
| | * | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | |
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \
| | * | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| | |\| | | |
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| | | |\ \ \ \
| | * | | | | | Hintable - Fix editable/hintable value property so it is bindable.Eric Guzman2012-06-18
| | * | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
| | |\| | | | |
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| | | |\ \ \ \ \
| | | * | | | | | Initial Text Tool ChangesArmen Kesablyan2012-06-05
| | * | | | | | | Hintable - Array type check fix for arrays created with map() method.Eric Guzman2012-06-10
| | * | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Armen Kesablyan2012-05-15
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/masterDomArc' into bindingArmen Kesablyan2012-05-14
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | ChangesArmen Kesablyan2012-05-14
| | * | | | | | | | | | | | After merge file changeArmen Kesablyan2012-05-09
| | * | | | | | | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-08
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Initial Setup of the binding ToolArmen Kesablyan2012-05-07
* | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixing our textfield component to support binding. Fix for IKNINJA-1394Valerio Virgillito2012-06-22
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Color Popup Test CandidateJose Antonio Marquez2012-06-25
* | | | | | | | | | | | | | Adding gradient mode to toolsJose Antonio Marquez2012-06-23
* | | | | | | | | | | | | | Added third gradient chip popupJose Antonio Marquez2012-06-22
* | | | | | | | | | | | | | Replacing temp color chip popJose Antonio Marquez2012-06-21
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Fixing reference issue for toolbar fill containerJose Antonio Marquez2012-06-21
* | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Timeline: bug fix "Layer name gets doubled" (Spreadsheet)Jon Reid2012-05-24
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:37:52 +0000