aboutsummaryrefslogtreecommitdiff
path: root/js/io
Commit message (Collapse)AuthorAge
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge pull request #372 from mencio/youtube-fixValerio Virgillito2012-07-09
|\ \ | |/ |/| Removing the youtube hack now that we have the proper fix from montage
| * Removing the youtube hack now that we have the proper fix from montageValerio Virgillito2012-07-03
| | | | | | | | | | | | Removing the saved instance of the component when opening a file containing the youtube component. Montage made the fix where the instance is now serialized property. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Update copyright boilerplateKris Kowal2012-07-06
|/
* adding missing montage to the user library and temporary fix for picas ↵Valerio Virgillito2012-07-03
| | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* including the map icons inside the component and adding the empty categoryValerio Virgillito2012-06-26
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #334 from joseeight/FileIOValerio Virgillito2012-06-25
|\ | | | | Modifying HTML template
| * Adding soft resetJose Antonio Marquez2012-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.hwc4872012-06-22
|/
* Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
|\ | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Runtime change for Paris material.hwc4872012-06-15
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| |\ | | | | | | | | | Textures
| * | Fixes for runtime Taper materialhwc4872012-06-13
| | |
* | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| |/ |/| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding banner templateJose Antonio Marquez2012-06-14
|/ | | | Added 'leader board' template to banners.
* Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-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 Joshi2012-06-11
| | | | | | | | change in bounding box due to smoothing
* | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-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-masterValerio Virgillito2012-06-06
| |\ | | | | | | Bugfix master
| | * Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-05
| | |\
| | * | IKNINJA-1645- fix - don't disable OK button on change of file typeAnanya Sen2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | added gradients to pen path runtimePushkar Joshi2012-06-06
| | | |
| * | | updated the ninja library version (now contains brushstroke and pen path ↵Pushkar Joshi2012-06-05
| | |/ | |/| | | | | | | rendering)
* | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-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 libsJose Antonio Marquez2012-06-03
| |/ | | | | | | Need to implement logic in parsing method, might require a minor restructuring.
* / adding the latest v0.10 montageValerio Virgillito2012-06-05
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Cleaning upJose Antonio Marquez2012-05-27
|
* Cleaning upJose Antonio Marquez2012-05-27
|
* Bumping RDGE version numberJose Antonio Marquez2012-05-22
| | | | This is to ensure there are no conflicts with older working files.
* changing @change to propertyChangeListenerValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* montage v.0.10 integrationValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding special preview for templatesJose Antonio Marquez2012-05-15
|
* Correcting location of Ninja meta dataJose Antonio Marquez2012-05-15
| | | | Needs to be inside most child div.
* Adding animation sub-category to new fileJose Antonio Marquez2012-05-15
| | | | Adding animation sub-category to template in new file.
* Fixing banner templateJose Antonio Marquez2012-05-14
| | | | Need to implement save, but this cover open and new.
* Adding support for new templatesJose Antonio Marquez2012-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 Rajbhandari2012-05-09
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Adding SAVE for I/OJose Antonio Marquez2012-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-ArchitectureNivesh Rajbhandari2012-05-04
|\
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| |\
| | * Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Fixing body's default styles.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
|\| | | |/ |/| | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:57:34 +0000