aboutsummaryrefslogtreecommitdiff
path: root/node_modules
Commit message (Collapse)AuthorAge
* Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* BSD LicenseKris Kowal2012-07-09
|
* 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 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>
* | adding missing copyright to the feed reader.Valerio Virgillito2012-07-06
| | | | | | | | 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>
* gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-07-03
| | | To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state.
* Fix for the youtube component close button on windowsValerio Virgillito2012-06-28
| | | | 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>
* fix for the youtube giving an error when having less than 3 imagesValerio Virgillito2012-06-26
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Reverting binding.jsArmen Kesablyan2012-06-26
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Can bind Multiple instanceArmen Kesablyan2012-06-25
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
|\ | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * fixing the size of the picasa imagesValerio Virgillito2012-06-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixed issue with Youtube not updating after save and Picasa bacgroundValerio Virgillito2012-06-21
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\| | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * fixing the components.Valerio Virgillito2012-06-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * montage v11 merge into ninjaValerio Virgillito2012-06-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * merging Stuart youtube fixValerio Virgillito2012-06-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * disabling the warningsValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the feed readerValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * 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 the latest v0.10 montageValerio Virgillito2012-06-05
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ \ | | | | | | | | Saving Google Components (reel components)
| | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\|
| | * | Fixing feedread componentJose Antonio Marquez2012-06-01
| | | |
| | * | Map fixesJose Antonio Marquez2012-06-01
| | | |
| | * | Fixing Google Map componentJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | Pulled in from components branch.
| | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| | |\ \ \
| * | | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-01
| |\ \ \ \
| | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-01
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-31
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | * | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | | | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style>
| * | | | removing the search bar componentValerio Virgillito2012-06-01
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | updating the feed reader to enable serializationValerio Virgillito2012-05-31
| | |/ | |/| | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | updating the google components serialization to enable savingValerio Virgillito2012-05-31
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:47:15 +0000