aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
|\
| * Timeline: Code cleanupJon Reid2012-05-18
| * Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| * Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| * Timeline: More bug fixes and code cleanup for multiselect.Jon Reid2012-05-17
| * Timeline: Bug fixes for multiselectJon Reid2012-05-17
| * Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-17
| |\
| * | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| * | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-16
| |\ \
| * \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-multis...Jon Reid2012-05-15
| |\ \ \
| * | | | Timeline: Multiselect from the layer panel.Jon Reid2012-05-15
| * | | | Merge branch 'timeline-local' into timeline-multiselectJon Reid2012-05-15
| |\ \ \ \
| | * | | | Timeline: Code cleanup. Improve efficiency for track scrolling.Jon Reid2012-05-15
| * | | | | Timeline: Multiselect.Jon Reid2012-04-27
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-22
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #239 from mayhewinator/WorkingBranchValerio Virgillito2012-05-16
| |\ \ \ \ \ \
| | * | | | | | fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| | * | | | | | -added new images for the text tool optionsJohn Mayhew2012-05-15
| | * | | | | | updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | * | | | | | Merge pull request #1 from mencio/WorkingBranchmayhewinator2012-05-15
| | |\ \ \ \ \ \
| | | * | | | | | Add color to tag toolValerio Virgillito2012-05-15
| | |/ / / / / /
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | * | | | | | -changed tool options radio button class to match the styling of the shape op...John Mayhew2012-05-14
| | * | | | | | -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | * | | | | | fixed bug introduced when we removed the color toolbar. The styling of the co...John Mayhew2012-05-11
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-10
| | |\ \ \ \ \ \
| | * | | | | | | put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
| | * | | | | | | removed unnecessary css classJohn Mayhew2012-05-10
| | * | | | | | | -moved sel tool images to proper folderJohn Mayhew2012-05-10
| | * | | | | | | -Consolidated many redundant css classes used in the tool options barsJohn Mayhew2012-05-09
| | * | | | | | | Correct layout and styling for the shape tool and its sub toolsJohn Mayhew2012-05-09
| | * | | | | | | -Put new selection tool icons in the options barJohn Mayhew2012-05-09
| | * | | | | | | implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | * | | | | | | removed unused classes form selection properties reelJohn Mayhew2012-05-08
| | * | | | | | | Moved out old select tool image css classes into the proper css file.John Mayhew2012-05-08
| | * | | | | | | moved all tag tool css back into the scss fileJohn Mayhew2012-05-08
| | * | | | | | | -Removed id dependence of the tag tool options CSSJohn Mayhew2012-05-08
| | * | | | | | | Removed unused SubSelect ToolJohn Mayhew2012-05-08
| | * | | | | | | Fixed missing quote from last mergeJohn Mayhew2012-05-07
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-07
| | |\ \ \ \ \ \ \
| | * | | | | | | | updated ninja.css from sassJohn Mayhew2012-05-07
| | * | | | | | | | more work on making subtool styling/layout consistentJohn Mayhew2012-05-07
| | * | | | | | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | * | | | | | | | First round of moving color chips into the sub tools. Shape and Pen tool now ...John Mayhew2012-05-03
* | | | | | | | | | more sub prop doc open supportJonathan Duran2012-05-22
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Fix restore tween for main layer track with multiple animation namesJonathan Duran2012-05-16
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | methods for setting simple ease and splitting sub prop spansJonathan Duran2012-05-16
* | | | | | | | Remove span highlighting and start syncing pos tracks and main track keyframesJonathan Duran2012-05-16
* | | | | | | | CSS pixel fix for prop tracksJonathan Duran2012-05-16