aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
Commit message (Collapse)AuthorAge
* 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>
| * fixing some of the document bindings.Valerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Objects Panel - Add Objects controller and montage/application hack to ↵Eric Guzman2012-05-16
|/ | | | expose template
* Removing unused components referencesValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Code reformattingValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* using prototype in the serializationAnanya Sen2012-05-03
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
|\
| * Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | | | | | preparation for montage converting to the new "prototype" format fully
* | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - code editor view options barAnanya Sen2012-04-13
| | | | | | | | | | | | | | - Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete - font zoom hottext Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
|/ | | | | | - cleaning up Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
|\ | | | | Presets - Adding presets controller
| * Presets Panel - Adding presets controller to serializationEric Guzman2012-03-22
| |
* | Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* adding a focus manager to handle panel bugs where blur was not getting ↵Valerio Virgillito2012-03-14
| | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Removing the obsolete modalContainer div.Valerio Virgillito2012-03-14
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* 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>
* Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
|\
| * Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
|/ | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-28
|\ | | | | | | | | | | | | | | | | into integration-candidate Conflicts: js/ninja.reel/ninja.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | removing the old settings class and disabling panel settings until the new ↵Valerio Virgillito2012-02-24
| | | | | | | | | | | | panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
|\|
| * Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\
| * | Tool Button FixesArmen Kesablyan2012-02-16
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | local storage integration and versioningValerio Virgillito2012-02-22
| |/ |/| | | | | | | | | - Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | enabling nested selectionValerio Virgillito2012-02-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵Valerio Virgillito2012-02-14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Add support for drag and drop for the components.Valerio Virgillito2012-02-14
| | |/ | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | moved file picker in file ioAnanya Sen2012-02-16
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | hide the rulers when no document is openAnanya Sen2012-02-16
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | fixes to document tabbingAnanya Sen2012-02-15
|/ / | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\| | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
| |\ | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/ninja.reel/ninja.html
| * | -Changed the capitalization of all main top level menus from all capsJohn Mayhew2012-02-10
| | | | | | | | | | | | | | | | | | -Added new main-menu-controller to be the default generic handler for menu item calls that do not need to call to a specific controller -Removed the test menu item -Finalized the help submenu items and hooked them up to the main-menu-controller
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | Integrate breadcrumb component and layer handling codeJonathan Duran2012-02-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | merge new timelineJonathan Duran2012-02-06
| |/ | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-02
| | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-02
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | File OpenJose Antonio Marquez2012-02-10
| | | | | | | | Adding the functionality to open a basic file.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:27:22 +0000