| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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> | ||
| * | 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 |
| | | | |||
| | * | 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> | ||
| * | 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 | ||
| * | | 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> | ||
| | * | 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. | ||
| * | 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> | ||
| * | 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-26 |
| |\ | |||
| | * | Updating the canvas runtime files for gradient and rectangle radius fixes. | Nivesh Rajbhandari | 2012-04-25 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Clean up | Jose Antonio Marquez | 2012-04-19 |
| |/ | |||
| * | block filenames and directories with all space | Ananya Sen | 2012-04-06 |
| | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | - disable ok when text box is cleared using backspace and cross, for file ↵ | Ananya Sen | 2012-04-04 |
| | | | | | | | name and directory location, in New file and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵ | John Mayhew | 2012-04-03 |
| | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support. | ||
| * | updated the rdge compiled version and its runtime, incremented rdge library ↵ | John Mayhew | 2012-04-03 |
| | | | | | version number | ||
| * | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| |\ | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| | * | IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵ | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | path includes the full filename Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | 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. | ||
| * / | 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. | ||
| * | Temp Runtime WebGL Fix | Jose Antonio Marquez | 2012-03-10 |
| | | | | | Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime. | ||
| * | Fixing Issues for Windows Lib | Jose Antonio Marquez | 2012-03-09 |
| | | |||
| * | Adding I/O functionality to RDGE | Jose Antonio Marquez | 2012-03-08 |
| | | | | | Added webGL/Canvas file I/O for Ninja, it also created routine for saving data for runtime, however, the runtime RDGE library needs an update for runtime to work, so right now I/O will only work for Ninja. | ||
| * | prefixing the local storage and using the new local-storage object. | Valerio Virgillito | 2012-02-24 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-17 |
| |\ | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | Adding new RDGE library data | Jose Antonio Marquez | 2012-02-16 |
| | | | |||
| | * | Setting up webGL library copy on save | Jose Antonio Marquez | 2012-02-15 |
| | | | |||
| | * | Setting up webGL local library (assets) | Jose Antonio Marquez | 2012-02-15 |
| | | | |||
| * | | remove similar function from coreioapi.js | Ananya Sen | 2012-02-16 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Revert "Revert "Reverting text/html document classes and setting up MVC ↵ | Ananya Sen | 2012-02-15 |
| | | | | | | | | | | | | | | | | | folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Revert "Reverting text/html document classes and setting up MVC folder ↵ | Ananya Sen | 2012-02-15 |
| |/ | | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-14 |
| |\ | |||
| | * | allow / in windows directory path | Ananya Sen | 2012-02-14 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Reverting text/html document classes and setting up MVC folder structure | Jose Antonio Marquez | 2012-02-14 |
| |/ | | | | Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers. | ||
| * | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ | |||
| | * | show iframeContainer if all documents are closed | Ananya Sen | 2012-02-10 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | File Save (with CSS styles) | Jose Antonio Marquez | 2012-02-12 |
| | | | | | | | | | Temp fix for saving styles in <style> of HTML document. | ||