Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fixing the live preview for the new document. | Valerio Virgillito | 2012-05-10 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 |
| | |||
* | Fixing references to iframe's styles in new template. | Nivesh Rajbhandari | 2012-05-04 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id | Valerio Virgillito | 2012-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.0 | Valerio Virgillito | 2012-05-03 |
| |\ | |||
| * | | code cleanup | Valerio Virgillito | 2012-05-02 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Removing unused components references | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Removing more id and changing the appropriate CSS for them | Valerio Virgillito | 2012-05-03 |
| |/ |/| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Code reformatting | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | using prototype in the serialization | Ananya Sen | 2012-05-03 |
| | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
|\| | |||
| * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
* | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-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 template | Valerio Virgillito | 2012-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 Virgillito | 2012-04-20 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | - collapse panels for code view, restore for design view | Ananya Sen | 2012-04-18 |
| | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | - code editor view options bar | Ananya Sen | 2012-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 logic | Ananya Sen | 2012-04-09 |
|/ | | | | | | - cleaning up Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 |
|\ | |||
| * | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-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 kept | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Resizing Bugs | Armen Kesablyan | 2012-03-29 |
|/ | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 |
|\ | | | | | Presets - Adding presets controller | ||
| * | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 |
| |\ | |||
| * | | Presets Panel - Adding presets controller to serialization | Eric Guzman | 2012-03-22 |
| | | | |||
* | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
|\ \ \ | |_|/ |/| | | Resizers refactoring | ||
| * | | minor glitch in calculations in snap code | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 |
| |/ | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Virgillito | 2012-03-14 |
| | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Removing the obsolete modalContainer div. | Valerio Virgillito | 2012-03-14 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge dhg637 DisabledState into master. | Valerio Virgillito | 2012-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, breadcrumb | Armen Kesablyan | 2012-03-12 |
| | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | Merge branch 'refs/heads/master' into panels | Valerio Virgillito | 2012-03-06 |
|\ | |||
| * | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-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 Virgillito | 2012-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-bugs | Valerio Virgillito | 2012-03-01 |
| | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵ | Valerio Virgillito | 2012-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 panel | Valerio Virgillito | 2012-02-27 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | removing the old settings class and disabling panel settings until the new ↵ | Valerio Virgillito | 2012-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 Virgillito | 2012-02-24 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-23 |
|\| | |||
| * | Merge branch 'refs/heads/master' into new-tool-icons | Armen Kesablyan | 2012-02-22 |
| |\ | |||
| * | | Tool Button Fixes | Armen Kesablyan | 2012-02-16 |
| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | | local storage integration and versioning | Valerio Virgillito | 2012-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 Virgillito | 2012-02-21 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵ | Valerio Virgillito | 2012-02-21 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | enabling nested selection | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> |