| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 | |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||
| | | * | | | | | | | | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 | |
| | | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | Integration | |||
| | | | * | | | | | | | Corrections for Uber shader IO | hwc487 | 2012-03-14 | |
| | | | | | | | | | | | ||||
| | | | * | | | | | | | Fixed BumpMetal material | hwc487 | 2012-03-13 | |
| | | | | | | | | | | | ||||
| | | | * | | | | | | | Merge pull request #5 from joseeight/FileIO-Integration | Eric | 2012-03-13 | |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Clean-Up | |||
| | | | * | | | | | | | | Uber material changes for IO | hwc487 | 2012-03-12 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Adding Temp drag-drop I/O support | Jose Antonio Marquez | 2012-03-15 | |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added methods to get data from dropped file while document is opened and save as a file. Currently only supporting images and SVGs, no error handling, which will have to be done. | |||
| | * | | | | | | | | | Merge pull request #116 from joseeight/Color | Valerio Virgillito | 2012-03-14 | |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | Temp Fix for: IKNINJA-1078 | |||
| | | * | | | | | | | | Temp Fix for: IKNINJA-1078 | Jose Antonio Marquez | 2012-03-13 | |
| | | | | | | | | | | | ||||
| | * | | | | | | | | | Removing the obsolete modalContainer div. | Valerio Virgillito | 2012-03-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | CSS Panel Updates - CSS tweaks and cleanup | Eric Guzman | 2012-03-16 | |
| | | | | | | | | | | | ||||
| * | | | | | | | | | | CSS Panel Updates - Added shorthand collapser | Eric Guzman | 2012-03-14 | |
| | | | | | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-14 | |
| |\| | | | | | | | | | ||||
| | * | | | | | | | | | Merge pull request #117 from mencio/layout-fix | Valerio Virgillito | 2012-03-14 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Layout Fixes and Canvas sized when panels are collapsed | |||
| | | * | | | | | | | | | Fixing the layout to only draw one level and stage resize when the panels ↵ | Valerio Virgillito | 2012-03-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are collapsed. Fixing the following bugs: IKNINJA-1068 Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | | | | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 | |
| |\| | | | | | | | | | | ||||
| | * | | | | | | | | | | Merge pull request #114 from mqg734/ToolFixes | Valerio Virgillito | 2012-03-13 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | Fixed selection rectangle for multiple selection case. | |||
| | | * | | | | | | | | | Fixed drawing of multiple selection bounds when in flat case. | Nivesh Rajbhandari | 2012-03-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | | Merge pull request #112 from ericguzman/PresetsPanel | Valerio Virgillito | 2012-03-13 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | | | Presets panel - Ninja-leaf hover state | |||
| | | * | | | | | | | | Presets Panel - Re-add dbl-click activation | Eric Guzman | 2012-03-13 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Presets Panel - Remove :active pseudo class from ninja-leaf | Eric Guzman | 2012-03-13 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Presets Panel - Add :active pseudo class for ninja-tree | Eric Guzman | 2012-03-13 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Presets Panel - Adding single-click activation | Eric Guzman | 2012-03-13 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Presets Panel - Adding hover state to ninja-leaf | Eric Guzman | 2012-03-13 | |
| | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||
| | * | | | | | | | | Deleting temp folder | Jose Antonio Marquez | 2012-03-13 | |
| | | | | | | | | | | ||||
| | * | | | | | | | | Renaming folder | Jose Antonio Marquez | 2012-03-13 | |
| | | | | | | | | | | ||||
| | * | | | | | | | | Gradient stop logic | Jose Antonio Marquez | 2012-03-13 | |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Made logic changes to allow for a minimum number of gradients to remain at 2 at all times and not apply default colors. | |||
| * | | | | | | | | CSS Panel - Style updates for collapsing branches | Eric Guzman | 2012-03-13 | |
| | | | | | | | | | ||||
| * | | | | | | | | CSS Panel - Add new panel to panel data | Eric Guzman | 2012-03-13 | |
| | | | | | | | | | ||||
| * | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js | |||
| | * | | | | | | | Merge pull request #109 from imix23ways/TimelineUber | Valerio Virgillito | 2012-03-13 | |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | | | Timeline uber | |||
| | | * | | | | | Fix unassigned track element on document switch | Jonathan Duran | 2012-03-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | Timeline : Fixing deleting the layers and hash table and removing while ↵ | Jonathan Duran | 2012-03-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loops replacing with for loops Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-12 | |
| | | |\ \ \ \ \ | ||||
| | | | * \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-09 | |
| | | | |\ \ \ \ \ | ||||
| | | | * | | | | | | Timeline: new enablePanel() method on TimelinePanel class. | Jon Reid | 2012-03-09 | |
| | | | | | | | | | | ||||
| | | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-12 | |
| | | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | | | |/ / / / | | | |/| | | | | ||||
| | | * | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-03-09 | |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||