aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
Commit message (Collapse)AuthorAge
* Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
|\ | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\
| * | code cleanupValerio Virgillito2012-05-02
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | 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
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\| | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | - 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 branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
|\
| * Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Resizing BugsArmen Kesablyan2012-03-29
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
|\ | | | | Presets - Adding presets controller
| * Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| |\
| * | Presets Panel - Adding presets controller to serializationEric Guzman2012-03-22
| | |
* | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
|\ \ \ | |_|/ |/| | Resizers refactoring
| * | minor glitch in calculations in snap codeArmen Kesablyan2012-03-23
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | 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>
* | Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
| | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Start WebGL animation during live preview. And set WebGL animation back to ↵Nivesh Rajbhandari2012-03-22
|/ | | | | | user preference when closing live preview. Signed-off-by: Nivesh Rajbhandari <mqg734@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>
* | user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| | | | | | | | 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-18
|\| | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Chrome PreviewJose Antonio Marquez2012-02-17
| | |
* | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:57:42 +0000