| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||
| | * | | | | | | | Merge branch 'refs/heads/montage-integration' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 | |
| | |\ \ \ \ \ \ \ | ||||
| | * | | | | | | | | Updating descriptor file | Jose Antonio Marquez | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still an outstanding issue of assets loaded dynamically. | |||
| | * | | | | | | | | 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 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 | |
| |\| | | | | | | | | | ||||
| | * | | | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-19 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | |||
| | * | | | | | | | | | | 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 | |||
| | * | | | | | | | | | | | Temp I/O functionality for M-JS components | Jose Antonio Marquez | 2012-03-18 | |
| | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional. | |||
| * | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | montage-integration | |||
| | * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-21 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | |||
| | | * | | | | | | | | | | Flow doesn't reset to origin 0 when changing the feed | François Frisch | 2012-03-21 | |
| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | Making flow flat on stage | François Frisch | 2012-03-21 | |
| | | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Feed Reader - Remove hard-coded font color for feed reader | Eric Guzman | 2012-03-21 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | 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 pull request #129 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-03-20 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added Montage button as a valid PI control and used it to invoke the edit material popup. | |||
| | | * | | | | | | | | | 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 branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | montage-integration | |||
| | * | | | | | | | | Initializing carousel in middle position | François Frisch | 2012-03-20 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | |||
| | * | | | | | | | | changing the RSS reader default sized and padding. | Valerio Virgillito | 2012-03-20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | 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 ↵ | Eric Guzman | 2012-03-20 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | |||
| | * | | | | | | | | | Feed Reader - Fix reference closure'd "this" | Eric Guzman | ||