aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* 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 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
|\
| * Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\
| | * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\
| | * | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| * | | Removing unused components referencesValerio Virgillito2012-05-03
| * | | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| * | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\ \ \ | | | |/ | | |/|
| | * | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | * | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | |\|
| | * | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | |\ \
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
| | |\ \ \ \
| | * | | | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| * | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| * | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \
| | * | | | | | Changing ID to Montage-ID for Color ComponentsJose Antonio Marquez2012-05-03
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #183 from mqg734/data-idValerio Virgillito2012-04-30
| |\ \ \ \ \ \
| | * | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ...Nivesh Rajbhandari2012-04-30
| * | | | | | | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| |/ / / / / /
| * / / / / / converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| |/ / / / /
* | | | | | 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
|/ / / / /
* | | | | Merge cleanupValerio Virgillito2012-04-27
* | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \ \
| * \ \ \ \ Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
| |\ \ \ \ \
| | * | | | | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | |_|_|/ | | |/| | |
| * / | | | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| |/ / / /
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
|\| | | |
| * | | | Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
| |\ \ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| | |\ \ \ \
| | * | | | | Allow users to toggle application of stroke and border settings when using th...Nivesh Rajbhandari2012-04-24
| | * | | | | Fixing translate handles to draw without zoom value. Also fixed some typos i...Nivesh Rajbhandari2012-04-20
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
|\| | | | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-24
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-04
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
| |\ \ \ \ \
| * | | | | | render the pen path with local coordinates, but use stage world coordinates t...Pushkar Joshi2012-04-02