| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of https://github.com/mayhewinator/ninja into v0.7.1 | Valerio Virgillito | 2012-07-24 |
| |\ | | | | | | | | | | | | | Conflicts: manifest.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja | John Mayhew | 2012-07-24 |
| | |\ | |||
| | * | | Updated manifest.json, page title, about box and splash screen to indicate ↵ | John Mayhew | 2012-07-24 |
| | | | | | | | | | | | | | that Ninja is in a preview release. | ||
| * | | | Merge branch 'UserDetection' of https://github.com/joseeight/ninja into v0.7.1 | Valerio Virgillito | 2012-07-24 |
| |\ \ \ | |||
| | * | | | New: OS check on load | Jose Antonio Marquez | 2012-07-24 |
| | | |/ | |/| | | | | | | | Performing OS check on load to redirect users to system requirements if their OS currently is not supported. | ||
| | * | | removing console log | Valerio Virgillito | 2012-07-24 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ \ | |||
| * | \ \ | Merge branch 'IKNinja_1980' of https://github.com/mqg734/ninja into v0.7.1 | Valerio Virgillito | 2012-07-24 |
| |\ \ \ \ | |||
| | * | | | | IKNinja-1980 - [Shape] changing the stroke size of the object doesn't update ↵ | Nivesh Rajbhandari | 2012-07-24 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | the bounding box selection. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'IKNinja_1974' of https://github.com/mqg734/ninja into v0.7.1 | Valerio Virgillito | 2012-07-24 |
| |\ \ \ \ | |||
| | * | | | | IKNinja-1974 - Bounding box gets separated from elements when zooming in/out ↵ | Nivesh Rajbhandari | 2012-07-24 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on banner and animation templates. IN draw-util's element change handler, we need to check for elementModel.pi instead of elementModel.selection now that ninja-content reports its selection as "div" instead of "body". Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ \ \ | |||
| * | | | | | removed console log | Valerio Virgillito | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninja into v0.7.1 | Valerio Virgillito | 2012-07-24 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | * | | | | Text Tool Color Change Fix | Armen Kesablyan | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1 | Valerio Virgillito | 2012-07-24 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | * | | | | Remove console logs | Jonathan Duran | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | FIX IK-1485 | Jonathan Duran | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 3D bug IK 1485 Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Merge branch 'jshint' of https://github.com/mencio/ninja into v0.7.1 | Valerio Virgillito | 2012-07-24 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | * | | | | jshint cleanup on the tools directory | Valerio Virgillito | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge branch 'tag-properties-fixes' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-23 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninja | Valerio Virgillito | 2012-07-23 |
| | |\ \ \ \ \ | |||
| * | \ \ \ \ \ | Merge branch 'tag-properties-fixes' of https://github.com/mencio/ninja into ↵ | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | v0.7.1 | ||
| | * | | | | | | tag-tool: Minor styles update and some cleanup | Valerio Virgillito | 2012-07-23 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Styled the position drop down and moved some styles to the reel. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninja ↵ | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | into v0.7.1 | ||
| | * | | | | | Bugs fixed: | hwc487 | 2012-07-23 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1915 - Data.JSON too large. Reduced mesh size and limited precision of fp numbers 1381 - Background transparency in preview. 1740 - File Save As caused WebGL to stop animating. Crossed RDGE IDs 1954 - Texture change from material popup broke screen rendering. Set correct context on property change. | ||
| * | | | | | Merge branch 'DOM-Manipulation' of https://github.com/joseeight/ninja into ↵ | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | v0.7.1 | ||
| | * | | | | Fix: Adding a check for element w/h/t/l | Jose Antonio Marquez | 2012-07-23 |
| | | | | | | | | | | | | | | | | | | | | | This fixes an issue with elements with no set width, height, top, left values from being handling through the PI. Currently those values will default to zero, a secondary fix will address this to show no value in PI and other panels. | ||
| | * | | | | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninja | Valerio Virgillito | 2012-07-23 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||
| * | | | | | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninja into v0.7.1 | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | | CSS Panel - Remove data attribute to remove style tags from document. | Eric Guzman | 2012-07-20 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/fixes_7.1' into minorFixes_7.1 | Eric Guzman | 2012-07-20 |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge branch 'refs/heads/master' into fixes_7.1 | Eric Guzman | 2012-07-20 |
| | | |\ \ \ \ | |||
| | | * | | | | | CSS Panel - Fix updating when media changes, sheets are deleted. | Eric Guzman | 2012-07-20 |
| | | | | | | | | |||
| | | * | | | | | Style Sheets - Show dirty marker when editing media attribute | Eric Guzman | 2012-07-18 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1 | Eric Guzman | 2012-07-18 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | CSS Panel - Handle media attribute changes | Eric Guzman | 2012-07-17 |
| | | | | | | | | | |||
| | | * | | | | | | Styles Controller - Re-add dirty event. Add data- attribute to keep created ↵ | Eric Guzman | 2012-07-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stylesheets. | ||
| | * | | | | | | | CSS Panel - Fix updating when media changes, sheets are deleted. | Eric Guzman | 2012-07-20 |
| | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1 | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | * | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-23 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||
| | | * | | | | | Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-22 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-20 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Binding view: fixed mouse move event outside the hud | Valerio Virgillito | 2012-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the variable event to 'e' Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | The zoom slider resets.Commented some code | Kruti Shah | 2012-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-20 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-19 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | * | \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | / / / / / / / | | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||