aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-12
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-09
| |\
| * | Timeline: new enablePanel() method on TimelinePanel class.Jon Reid2012-03-09
| | |
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-12
|\ \ \ | |_|/ |/| |
| * | Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| | | | | | | | | | | | | | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | reverting old pi dataValerio Virgillito2012-03-09
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Temp Gradient FixJose Antonio Marquez2012-03-09
| | | | | | | | | | | | Temporary fix for getting gradient mode.
| * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| |\ \
| | * \ Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| | |\ \ | | | | | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist
| | | * | Disabled state for panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| | |\ \ \ | | | | | | | | | | | | Timeline uber
| | | * | | Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | Image data fix on OpenJose Antonio Marquez2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug with data-uris not opening correctly.
| | * | | | Adding To-do comments for CDN stylesheetsJose Antonio Marquez2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Removed inserting CDN styles into head as it was proper because the hierarchy would be lost, and there is no current fast-alternative to achieve a preview.
| | * | | | Removing temp viewing of CDN stylesJose Antonio Marquez2012-03-07
| | | |/ / | | |/| | | | | | | | | | | | It's not done correctly, we really need the proxy for this.
| | * | | Adding CDN support for URLs in linked CSSJose Antonio Marquez2012-03-06
| | | | |
| * | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-02-29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bug FixesJose Antonio Marquez2012-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
| * | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
* | | | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-09
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |