| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-21 |
| |\ | | | | | | | FileIO-Montage-Components | ||
| | * | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ | |||
| | * \ | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ \ | |||
| | * \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ | | | | | | | | | | | | | | | | montage-integration | ||
| | | * | | | Presets Panel - Add Font style preset | Eric Guzman | 2012-03-21 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ \ | |||
| * | \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||
| | * | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ... | ||
| | | * | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵ | Ananya Sen | 2012-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/montage-integration' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | montage-integration | ||
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ | Merge branch 'refs/heads/button-switch' into montage-integration | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||
| * | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | Fix: Chrome 19 I/O Bug | Jose Antonio Marquez | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed creating new files. | ||
| | * | | | | | | | | | | Removing usage of webRequest APIs | Jose Antonio Marquez | 2012-03-21 |
| | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the usage of the webRequest API since all files are parsed on open to handle prefixing correct origin. This will most likely not work for assets that are added dynamically and will most likely break, all those adding linking to assets should make use of a function in the mediator to mask the display value and actual value of the linked asset. | ||
| * | | | | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-20 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | | * | | | | | | | | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * / | | | | | | | Presets - Animation update | Eric Guzman | 2012-03-20 |
| | |/ / / / / / / | |||
| | * | | | / / / | fixing the selection for the picasa carousel | Valerio Virgillito | 2012-03-19 |
| | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Maps - Apply default width and height styles to components if specified. ↵ | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | |||
| | * | | | | | Button's enabled property binding should be oneway only. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Support edit material button in oval and line PI. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _planesArray's length to 0 instead of setting the arrays to null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| | | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge pull request #126 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ | | | | | | | | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset | ||
| | | * | | | | Presets Panel - Fix conflict with default transition presets | Eric Guzman | 2012-03-17 |
| | | | | | | | |||
| | | * | | | | Merge branch 'refs/heads/master' into AddAnimationsLibrary | Eric Guzman | 2012-03-17 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js | ||
| | | * | | | | Presets Panel - Change Tab labels, Add Un-3d preset | Eric Guzman | 2012-03-16 |
| | | | | | | | |||
| | * | | | | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | | |/ / / | |/| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-19 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | FileIO-Montage-Components | ||
| | * | | | | fixing the selection of components. Temporary workaround for now. | Valerio Virgillito | 2012-03-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Tests and clean-up | Jose Antonio Marquez | 2012-03-18 |
| | | | | | | |||
| * | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-18 |
| |\| | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | | | looping through both branches of the components tree | Valerio Virgillito | 2012-03-18 |
| | | |_|/ | |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | |||