summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-2770-5578/+140
* Merge pull request #4077 from nextcloud/better-navigation-managementMorris Jobke2017-03-262-59/+1
|\
| * Move app management to the settings menuJoas Schilling2017-03-261-23/+1
| * Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-261-6/+0
| * Register the app management in the normal wayJoas Schilling2017-03-261-31/+1
* | Merge pull request #4068 from nextcloud/use-eval-instead-of-get-scriptMorris Jobke2017-03-261-9/+14
|\ \
| * | Cleanup code as suggested by @icewind1991Lukas Reschke2017-03-261-16/+8
| * | Make asyncLukas Reschke2017-03-261-4/+2
| * | Fix callbackLukas Reschke2017-03-261-1/+1
| * | Use eval instead of $.scriptLukas Reschke2017-03-261-8/+23
* | | Merge pull request #4075 from nextcloud/search-hover-feedbackLukas Reschke2017-03-261-1/+5
|\ \ \
| * | | add hover feedback for search, and opacity on useJan-Christoph Borchardt2017-03-261-1/+5
| |/ /
* | | Merge pull request #4074 from nextcloud/replace-name-with-iconMorris Jobke2017-03-264-22/+21
|\ \ \
| * | | replace name in top right with icon for less noiseJan-Christoph Borchardt2017-03-264-22/+21
| |/ /
* | | Merge pull request #4069 from nextcloud/fix-emptycontent-font-colorMorris Jobke2017-03-261-1/+1
|\ \ \ | |_|/ |/| |
| * | fix emptycontent font color lightnessJan-Christoph Borchardt2017-03-261-1/+1
| |/
* | Update bundled core.jsRoeland Jago Douma2017-03-261-1/+1
* | [js] Bump DOMPurifyRoeland Jago Douma2017-03-262-7/+6
|/
* Merge pull request #4053 from nextcloud/bump-zxcvbnMorris Jobke2017-03-262-8/+7
|\
| * [3rdparty] Bump zxcvbnRoeland Jago Douma2017-03-252-8/+7
* | [tx-robot] updated from transifexNextcloud bot2017-03-264-4/+18
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-252-0/+2
* Merge pull request #4043 from nextcloud/merge-js-for-template-prependMorris Jobke2017-03-241-0/+17
|\
| * Merge JS for template prependLukas Reschke2017-03-241-0/+17
* | Merge login JSLukas Reschke2017-03-242-5/+6
* | Merge pull request #4041 from nextcloud/merge-systemtags-jsLukas Reschke2017-03-241-0/+7
|\ \
| * | Merge systemtags JSLukas Reschke2017-03-241-0/+7
| |/
* / Merge sharing backend JSLukas Reschke2017-03-241-0/+11
|/
* [PoC] JS CombinerRoeland Jago Douma2017-03-243-0/+91
* Merge pull request #4026 from nextcloud/appmenu-fixLukas Reschke2017-03-241-1/+2
|\
| * Fix appmenu issuesJulius Härtl2017-03-241-1/+2
* | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-242-1/+42608
|\ \
| * | Merge vendor jsRoeland Jago Douma2017-03-232-1/+42608
* | | Merge pull request #4022 from nextcloud/downstream-27105Roeland Jago Douma2017-03-242-4/+8
|\ \ \ | |_|/ |/| |
| * | Remove auto-focus on certain input fieldsFelix Heidecke2017-03-232-4/+8
| |/
* | Merge pull request #4025 from nextcloud/downstream-27292Roeland Jago Douma2017-03-242-5950/+1
|\ \
| * | Properly clear heartbeat intervalVincent Petry2017-03-231-1/+1
| * | Update karma, use sinon from npmVincent Petry2017-03-231-5949/+0
| |/
* | Merge pull request #3928 from nextcloud/downstream-17978Morris Jobke2017-03-232-0/+93
|\ \ | |/ |/|
| * Improve error message of charset convert script and behaviourMorris Jobke2017-03-231-4/+5
| * Address commentsMorris Jobke2017-03-211-1/+1
| * Adding tests for 4 byte unicode charactersMorris Jobke2017-03-212-0/+92
* | Merge pull request #3997 from nextcloud/backport-27353Roeland Jago Douma2017-03-232-25/+83
|\ \
| * | Update davclient.js to 0.1.1Vincent Petry2017-03-222-25/+83
* | | [tx-robot] updated from transifexNextcloud bot2017-03-232-0/+20
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-03-2210-4/+46
* | Revert "Bundle vendor js"Roeland Jago Douma2017-03-222-42551/+1
* | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-222-1/+42551
|\ \
| * | Bump core.jsRoeland Jago Douma2017-03-221-1/+2
| * | Bundle more default vendor jsRoeland Jago Douma2017-03-222-2/+4236