aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Adding support for gradients on chipsJose Antonio Marquez2012-06-23
* Fixing bug with gradient stop limitsJose Antonio Marquez2012-06-22
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
|\
| * remove old methodJonathan Duran2012-06-20
| * remove unneeded filesJonathan Duran2012-06-20
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| |\
| * \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
| |\ \
| * | | Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
| * | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
| |\ \ \ \
| | * \ \ \ 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
| | |\ \ \ \ \ \
| * | | | | | | | Sub PropsKruti Shah2012-06-12
| * | | | | | | | Color chip in TPKruti Shah2012-06-08
| * | | | | | | | Color ChipKruti Shah2012-05-31
| |/ / / / / / /
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| | * | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| | * | | | | | | | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
* | | | | | | | | | - added io api to generate file from binaryAnanya Sen2012-06-21
* | | | | | | | | | Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ...Ananya Sen2012-06-20
* | | | | | | | | | adding some error handlingAnanya Sen2012-06-19
* | | | | | | | | | parse html in memory, instead of using a doom elementAnanya Sen2012-06-19
* | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Fixing merge issueshwc4872012-05-14
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textureshwc4872012-05-03
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin...Nivesh Rajbhandari2012-05-03
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Material editorhwc4872012-05-02
| * | | | | | | | | | | | | | More cleaning upJose Antonio Marquez2012-06-16
| * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't ...Nivesh Rajbhandari2012-06-14
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * / | | | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fixed document switching issuesValerio Virgillito2012-06-12
| | * | | | | | | | | | | | hack fix for the PI section throwing errors when dom is not ready to drawValerio Virgillito2012-06-12
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * / | | | | | | | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| |/ / / / / / / / / / /
* | | | | | | | | | | | start pasting in-place for cut/pasteAnanya Sen2012-06-18
* | | | | | | | | | | | Fixed - IKNINJA-1748 - While pasting text in any text field in the PI, the te...Ananya Sen2012-06-15
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:26:18 +0000