aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | Timeline: Multiselect from the layer panel.Jon Reid2012-05-15
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'timeline-local' into timeline-multiselectJon Reid2012-05-15
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
| | * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | Tool Options styling and Icon update
| | * | | | | | | | | | fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| | | | | | | | | | | |
| | * | | | | | | | | | -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images
| | * | | | | | | | | | updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed its use of the sprite sheet
| | * | | | | | | | | | Merge pull request #1 from mencio/WorkingBranchmayhewinator2012-05-15
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Working branch - Adding the color pre-flight for the Tag tool
| | | * | | | | | | | | | Add color to tag toolValerio Virgillito2012-05-15
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-15
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| | * | | | | | | | | | -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -implemented the new mode radio buttons for the pen tool
| | * | | | | | | | | | -changed tool options radio button class to match the styling of the shape ↵John Mayhew2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group
| | * | | | | | | | | | -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -made tag and zoom tool radio group button styles consistent and removed duplicate classes
| | * | | | | | | | | | fixed bug introduced when we removed the color toolbar. The styling of the ↵John Mayhew2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-10
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | WorkingBranch
| | * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -finished styling shape tool options -added new icons for shape tool
| | * | | | | | | | | | -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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Styled the selection tool options bar
| | * | | | | | | | | | implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make all icons for fill and stroke use the proper classes/images
| | * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added extra padding before first input control
| | * | | | | | | | | | -Removed id dependence of the tag tool options CSSJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class
| | * | | | | | | | | | 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 ↵John Mayhew2012-05-07
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |