aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | 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>
| | * | | | | | | | upgrading to CodeMirror 2.23, since it has an important fix to Not close ↵Ananya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja, if backspace is pressed while autocomplete dropdown is open. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | -styled the autocomplete dropdownAnanya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - trigger autocomplete automatically Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | adding basic autocompleteAnanya Sen2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Ananya Sen2012-03-28
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Codeview-improvements
| | * | | | | | | | | - Highlight Matching bracketAnanya Sen2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Highlight selection matched -Highlight current line Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | Timeline uber
| | * | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-01
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Timeline: bug fix: disable bread crumb setlevel.Jon Reid2012-04-30
| | | | | | | | | | | |
| | | * | | | | | | | | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | | | | | | | | | | |
| | | * | | | | | | | | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | | | | | | | | | | |
| * | | | | | | | | | | minor formattingValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | Merge branch 'Master-Dom-Manipulation' of ↵Valerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | https://github.com/ntfx47/ninja-internal
| | * | | | | | | | | | Dom ManipulationKruti Shah2012-05-03
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | | | | | Merge pull request #190 from ananyasen/master-data-idValerio Virgillito2012-05-03
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use data-montage-id instead of id in template
| * | | | | | | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
| | | | | | | | | | | |
| * | | | | | | | | | | Changing ID to Montage-ID for Color ComponentsJose Antonio Marquez2012-05-03
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #186 from mqg734/StageWebTemplateValerio Virgillito2012-05-02
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | More grid drawing fixes for new web template workflow. Also, adding back ability to draw when working plane changes.
| | * | | | | | | | | Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Draw a red outline around the stage for reference when rotating stage.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Offset side and top working planes by half the stage width/height.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Merge pull request #184 from mqg734/StageWebTemplateValerio Virgillito2012-05-01
| |\| | | | | | | | | | | |/ / /