Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Removed the shaders that we do not have rights to. | Valerio Virgillito | 2012-07-10 |
| | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/models/materials-model.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | fix doctype capitalization | John Mayhew | 2012-07-09 |
| | |||
* | BSD License | Kris Kowal | 2012-07-09 |
| | |||
* | Update copyright boilerplate | Valerio Virgillito | 2012-07-06 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | including the map icons inside the component and adding the empty category | Valerio Virgillito | 2012-06-26 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge pull request #334 from joseeight/FileIO | Valerio Virgillito | 2012-06-25 |
|\ | | | | | Modifying HTML template | ||
| * | Adding soft reset | Jose Antonio Marquez | 2012-06-23 |
| | | | | | | | | Adding a soft reset to the HTML file we create, this eliminates the margin/padding added to the page by browsers, and better illustrates what the user sees in Ninja. | ||
* | | fixed a small startup issue with the RDGE library. | hwc487 | 2012-06-22 |
|/ | |||
* | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 |
|\ | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Runtime change for Paris material. | hwc487 | 2012-06-15 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| |\ | | | | | | | | | | Textures | ||
| * | | Fixes for runtime Taper material | hwc487 | 2012-06-13 |
| | | | |||
* | | | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
| |/ |/| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Adding banner template | Jose Antonio Marquez | 2012-06-14 |
|/ | | | | Added 'leader board' template to banners. | ||
* | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-12 |
|\ | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fix the brush tool runtime: update the brush coordinates to account for ↵ | Pushkar Joshi | 2012-06-11 |
| | | | | | | | | change in bounding box due to smoothing | ||
* | | adding more missing properties | Valerio Virgillito | 2012-06-11 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
|\| | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge pull request #274 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-06 |
| |\ | | | | | | | Bugfix master | ||
| | * | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-05 |
| | |\ | |||
| | * | | IKNINJA-1645- fix - don't disable OK button on change of file type | Ananya Sen | 2012-06-05 |
| | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | added gradients to pen path runtime | Pushkar Joshi | 2012-06-06 |
| | | | | |||
| * | | | updated the ninja library version (now contains brushstroke and pen path ↵ | Pushkar Joshi | 2012-06-05 |
| | |/ | |/| | | | | | | | rendering) | ||
* | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-06 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Adding blocking logic to copy libs | Jose Antonio Marquez | 2012-06-03 |
| |/ | | | | | | | Need to implement logic in parsing method, might require a minor restructuring. | ||
* / | adding the latest v0.10 montage | Valerio Virgillito | 2012-06-05 |
|/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | |||
* | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | |||
* | Bumping RDGE version number | Jose Antonio Marquez | 2012-05-22 |
| | | | | This is to ensure there are no conflicts with older working files. | ||
* | changing @change to propertyChangeListener | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | montage v.0.10 integration | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Adding special preview for templates | Jose Antonio Marquez | 2012-05-15 |
| | |||
* | Correcting location of Ninja meta data | Jose Antonio Marquez | 2012-05-15 |
| | | | | Needs to be inside most child div. | ||
* | Adding animation sub-category to new file | Jose Antonio Marquez | 2012-05-15 |
| | | | | Adding animation sub-category to template in new file. | ||
* | Fixing banner template | Jose Antonio Marquez | 2012-05-14 |
| | | | | Need to implement save, but this cover open and new. | ||
* | Adding support for new templates | Jose Antonio Marquez | 2012-05-11 |
| | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template. | ||
* | Adding support to save body's css styles on preview. | Nivesh Rajbhandari | 2012-05-09 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Adding SAVE for I/O | Jose Antonio Marquez | 2012-05-08 |
| | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up... | ||
* | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
|\ | |||
| * | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 |
| |\ | |||
| | * | Removing more id and changing the appropriate CSS for them | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Fixing body's default styles. | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
|\| | | |/ |/| | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Full CSS support on open | Jose Antonio Marquez | 2012-05-03 |
| | | | | | | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened. | ||
| * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-27 |
| |\ | |||
| * \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 |
| |\ \ | |||
| * | | | Clean up | Jose Antonio Marquez | 2012-04-19 |
| | | | | |||
* | | | | use data-montage-id instead of id in template | 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 |
|\ \ \ \ | | |_|/ | |/| | |