aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
Commit message (Collapse)AuthorAge
* BSD LicenseKris Kowal2012-07-09
|
* Update copyright boilerplateValerio Virgillito2012-07-06
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #355 from dhg637/GIO_binding-viewValerio Virgillito2012-06-28
|\ | | | | Gio binding view bugs and fixes
| * Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internalArmen Kesablyan2012-06-27
| |\
| * | Binding View - Hide in Live PreviewArmen Kesablyan2012-06-26
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Changing the livePreview button to do a chromePreview and keeping the canvas ↵Valerio Virgillito2012-06-28
| |/ |/| | | | | | | | | when doing a timeline play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
|\| | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ | | | | | | Binding View - Binding Tool & Binding Panel
| | * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Objects Tray - Add hiding based on workspace mode.Eric Guzman2012-06-15
| | | | |
| | * | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Objects Controller - Add bindable controller properties, and bindings getterEric Guzman2012-05-30
| | | | | |
| | * | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Changes to binding viewArmen Kesablyan2012-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | Objects Panel - Add Objects controller and montage/application hack to ↵Eric Guzman2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expose template
| | * | | | | | | Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| | * | | | | | | | Finished skeleton structure for binding.Armen Kesablyan2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | created the initial environment requirements for workspace to be manipulated.Armen Kesablyan2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | | | refactored to move bindings to templateAnanya Sen2012-06-26
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | / Fix for IKNINJA-1615: Enable mouse up event on top of the user document ↵Valerio Virgillito2012-06-25
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar Chrome has a bug where mouse up does not fire when the mouse is released on top of a scrollbar. To work around this issue, I temporary increase the canvas to cover the scrollbar when drawing and then shrink it back on mouse up. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | removed some redundantsAnanya Sen2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
| |\ \ \ \ \ \ \
| * | | | | | | | fixed document switching issuesValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | remove serializable from custom sectionValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-13
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Adding close Ninja promptJose Antonio Marquez2012-06-11
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Adding a prompt to the user to ensure all data is saved prior to closing the application. This will not let me check for documents to need saving, so it must be general and will appear at all times.
* | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |