aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| |\
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-10
| |\ \
| * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-07
| |\ \ \
| * | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
* | | | | Fixing merge issueshwc4872012-05-14
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | |_|/ | |/| |
| * | | Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| |\ \ \
| | * | | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| * | | | fixed javascript errorsAnanya Sen2012-05-07
| | |_|/ | |/| |
| * | | fixing the currentContainerValerio Virgillito2012-05-03
| * | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ \
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | added shortkeys for commenting and uncommentAnanya Sen2012-04-30
| | * | | | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-04-30
| | * | | | added key shortcuts' list dropdown in view option barAnanya Sen2012-04-27
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | |\ \ \ \
| | * | | | | removing debuggerAnanya Sen2012-04-26
| | * | | | | IKNINJA-1551 - added editor support for other file typesAnanya Sen2012-04-26
| | * | | | | - use on ctrl+space for code hintingAnanya Sen2012-04-25
| | * | | | | IKNINJA-1529 : zooming such that cursor position can be calculated accuratelyAnanya Sen2012-04-24
| | * | | | | IKNINJA-1530 : turned off autocompletion and just kept the code hintingAnanya Sen2012-04-24
| | * | | | | IKNINJA-1529 : zooming to fix font overlap issueAnanya Sen2012-04-23
| | * | | | | set editor background color as per the selected themeAnanya Sen2012-04-20
| | * | | | | - disable autocompletion option for unsupported file typeAnanya Sen2012-04-19
| | * | | | | - fixed the text cursorAnanya Sen2012-04-19
| | * | | | | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | * | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
| | |\ \ \ \ \
| | * | | | | | added theme choices for editorAnanya Sen2012-04-17
| | * | | | | | Added comment and uncomment control in the editor view optionsAnanya Sen2012-04-16
| | * | | | | | - code editor view options barAnanya Sen2012-04-13
| | * | | | | | - added configurability of code completion with the file typeAnanya Sen2012-04-09
| | * | | | | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| * | | | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | minor formattingValerio Virgillito2012-05-03
| | * | | | | | Dom ManipulationKruti Shah2012-05-03
| | | |_|_|/ / | | |/| | | |
| * | | | | | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| * | | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| |/ / / / /
* | | | | | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textureshwc4872012-05-03
|\ \ \ \ \ \
| * | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin...Nivesh Rajbhandari2012-05-03
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-02
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
* | | | | | Material editorhwc4872012-05-02
|/ / / / /
* | | | / Squashed commit of stage architectureValerio Virgillito2012-04-30
| |_|_|/ |/| | |
* | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| * | | 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