| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-12 |
| |\ | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js | ||
| | * | Merge branch 'refs/heads/master' into dom-container | Valerio Virgillito | 2012-06-11 |
| | |\ | |||
| | | * | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2 | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Merge branch 'refs/heads/master' into timeline-resizer-fix | Valerio Virgillito | 2012-06-08 |
| | | |\ | |||
| | | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger error | Valerio Virgillito | 2012-06-07 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
| | | |/ | |/| | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing the body color chip for non banners templates | Valerio Virgillito | 2012-06-07 |
| | |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | removing all model creators. | Valerio Virgillito | 2012-06-05 |
| | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Disabled the add, copy, and delete buttons in the material library panel. ↵ | hwc487 | 2012-06-12 |
| | | | | | | | | | Also removed the Custom Materials section. | ||
| * | | material cleanup and rearchitecture | hwc487 | 2012-06-06 |
| | | | |||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-05 |
| |\| | | | | | | | Textures | ||
| | * | Merge pull request #266 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | |\ | | | | | | | components fix: adding a first draw event to components | ||
| | | * | components fix: adding a first draw event to components | Valerio Virgillito | 2012-06-04 |
| | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Timeline: Fix line endings, set to UNIX. | Jon Reid | 2012-06-05 |
| | | | | |||
| | * | | Timeline: Fixes to timeline to handle document switching & breadcrumb | Jon Reid | 2012-06-04 |
| | |/ | | | | | | | interactions under new DOM Architecture. | ||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 |
| |\| | | | | | | | Textures | ||
| | * | Merge pull request #264 from mencio/document-bindings-fix | Valerio Virgillito | 2012-06-04 |
| | |\ | | | | | | | Document bindings fix - Changing the documents architecture to use bindings instead of events | ||
| | | * | fix for the css panel | Valerio Virgillito | 2012-06-01 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Valerio Virgillito | 2012-05-31 |
| | | |\ | | | | | | | | | | | | | document-bindings-fix | ||
| | | * | | fixing selection when switching documents | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | fixing the closing of documents | Valerio Virgillito | 2012-05-30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵ | Valerio Virgillito | 2012-05-30 |
| | | |\ \ | | | | | | | | | | | | | | | | into document-bindings-fix | ||
| | | | * | | PI's 3d section was not binding correctly to the current document. | Nivesh Rajbhandari | 2012-05-30 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | fixing the timeline current document bindings | Valerio Virgillito | 2012-05-30 |
| | | |/ / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Fixing the close document. | Valerio Virgillito | 2012-05-30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | document bindings phase 1 | Valerio Virgillito | 2012-05-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 |
| |\| | | | | | | | | | | | | | | | Textures | ||
| | * | | | removing the search bar component | Valerio Virgillito | 2012-06-01 |
| | | |/ | |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Correction for texture paths. | hwc487 | 2012-06-01 |
| | | | | |||
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-31 |
| |\| | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | * | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-29 |
| | |\| | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates | ||
| | | * | fix for the id and class controls in the pi | Valerio Virgillito | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | the id and class did not set values from the pi because of the removals of all id's on element. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| | | | * | adding document views checks for the timeline and breadcrumb | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | Merge pull request #253 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-23 |
| | | | |\ | | | | | | | | | | | Fixing triggerBinding warning from timeline panel. | ||
| | | | | * | Timeline triggerBinding needs to be set to false in the track data. | Nivesh Rajbhandari | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Merge pull request #252 from ananyasen/dom-architecture | Valerio Virgillito | 2012-05-23 |
| | | | |\ \ | | | | |/ | | | |/| | bug fixes | ||
| | | | | * | - removed redundant change | Ananya Sen | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed js error on click of splitters when no documents are open Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | * | Merge branch 'refs/heads/master-dom-architecture' into dom-architecture | Ananya Sen | 2012-05-22 |
| | | | | |\ | |||
| | | | | * | | - don't redraw stage for code document - fixes a switching bug | Ananya Sen | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix for ctrl+S for code document - disallow opening the panels while in code document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| | | |/ / / | | | | | | | | | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
| | | * | | | minor formatting fixes | Valerio Virgillito | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Merge pull request #251 from ericguzman/CSSPanelUpdates | Valerio Virgillito | 2012-05-22 |
| | | |\ \ \ | | | |_|/ | | |/| | | Css panel updates | ||
| | | * | | | fixing the undefined 'color' issue | Valerio Virgillito | 2012-05-22 |
| | | | |/ | | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | CSS Panel - Handle focus after editing selector | Eric Guzman | 2012-05-29 |
| | | | | | |||
| | * | | | CSS Panel - Find correct previously-rendered rule list after selection. | Eric Guzman | 2012-05-29 |
| | | | | | |||
| | * | | | CSS Panel - Prevent Animation on New Style | Eric Guzman | 2012-05-27 |
| | | |/ | |/| | |||
| | * | | Style Sheets - Remove duplicate class name from stylesheets toolbar | Eric Guzman | 2012-05-22 |
| | | | | |||
| | * | | CSS Style - Fix issue when changing value to same value minus units. | Eric Guzman | 2012-05-22 |
| | | | | |||
| | * | | CSS Panel - Fix applying selector to element when selector not changed | Eric Guzman | 2012-05-22 |
| | | | | |||