aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* -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 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
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * Fixing the color popupValerio Virgillito2012-05-04
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the currentContainerValerio Virgillito2012-05-03
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\
| | * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \
| | * | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | code cleanupValerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Fixing the lock button cssValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Code reformattingValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| | |\ \ \ \ | | | | | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1]
| | | * | | | using prototype in the serializationAnanya Sen2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-02
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | removing format button for now until fully implementedAnanya Sen2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | disable format button for nowAnanya Sen2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | added copyrightsAnanya Sen2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | set up different activeline colors for different themesAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | added shortkeys for commenting and uncommentAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | IKNINJA-1562 : override font-size for some themes to allow xoomingAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1568 - code hinting not supported for son files Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | added key shortcuts' list dropdown in view option barAnanya Sen2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | increasing z-indem of code hinting dropdown to appear above the disabled panelsAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | IKNINJA-1534: don't show code hinting automatically, when word removed via ↵Ananya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backspaces Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | removing debuggerAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | IKNINJA-1551 - added editor support for other file typesAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | - use on ctrl+space for code hintingAnanya Sen2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use prototype in serialization for montage 0.8 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | IKNINJA-1529 : zooming such that cursor position can be calculated accuratelyAnanya Sen2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | IKNINJA-1530 : turned off autocompletion and just kept the code hintingAnanya Sen2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | IKNINJA-1529 : zooming to fix font overlap issueAnanya Sen2012-04-23
| |