aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-04
|\
| * Timeline: More fixes to selection changing and document switching.Jon Reid2012-05-04
| |
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | IKNINJA-1528 : temporarily disabling active line color for thisAnanya Sen2012-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | fixed ugly scroll coming in the middle of the page for a short fileAnanya Sen2012-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
| | |\ \ \ \ \
| | * | | | | | set editor background color as per the selected themeAnanya Sen2012-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - disable autocompletion option for unsupported file typeAnanya Sen2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - fixed the text cursorAnanya Sen2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - code cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
| | |\ \ \ \ \ \
| | * | | | | | | added theme choices for editorAnanya Sen2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | Added comment and uncomment control in the editor view optionsAnanya Sen2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | - code editor view options barAnanya Sen2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete - font zoom hottext Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | - added configurability of code completion with the file typeAnanya Sen2012-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added logic to toggle between automatic code completion and manually triggered code completion [ UI pending ] Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cleaning up Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Ananya Sen2012-04-04
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Codeview-improvements
| | * | | | | | | | - fix for current line highlighting for version 2.23Ananya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - changes to not show autocomplete dropdown for brackets Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | -styled the autocomplete dropdownAnanya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <