summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-09-28276-704/+820
* Merge pull request #11414 from nextcloud/csp/11029/contacts_menu_compiled_han...Morris Jobke2018-09-289-81/+191
|\
| * Compile contactmenu handlebars templatesRoeland Jago Douma2018-09-279-81/+191
* | Merge pull request #11423 from nextcloud/inline-input-error-fixMorris Jobke2018-09-281-160/+160
|\ \
| * | TABS :DJohn Molakvoæ (skjnldsv)2018-09-281-160/+160
| * | Fix invalid inline input confirm borderJohn Molakvoæ (skjnldsv)2018-09-281-5/+5
* | | Merge pull request #11417 from nextcloud/hover-quota-used-space-regressionJohn Molakvoæ2018-09-286-17/+42
|\ \ \
| * | | State default unknown quota to 0John Molakvoæ (skjnldsv)2018-09-284-7/+12
| * | | Fix class selector for acceptance testsJohn Molakvoæ (skjnldsv)2018-09-281-1/+1
| * | | Fix string formattingJohn Molakvoæ (skjnldsv)2018-09-273-3/+3
| * | | Add back the total used space per userJohn Molakvoæ (skjnldsv)2018-09-275-12/+32
| |/ /
* | | Merge pull request #11412 from nextcloud/csp/11032/authtoekn_compiled_handlebarsChristoph Wurst2018-09-284-32/+69
|\ \ \
| * | | Compile handlebars template for AuthTokenViewRoeland Jago Douma2018-09-274-32/+69
* | | | Merge pull request #11410 from nextcloud/csp/11030/filesummary_compiled_handl...Roeland Jago Douma2018-09-275-13/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Compile filesummary handlebarsRoeland Jago Douma2018-09-275-13/+26
|/ / /
* | | Merge pull request #11416 from nextcloud/bugfix/11218/show-email-authtype-noneblizzz2018-09-271-1/+1
|\ \ \
| * | | Show auth type "None" in email settingsMorris Jobke2018-09-271-1/+1
| |/ /
* | | Merge pull request #10833 from nextcloud/fix_8623Morris Jobke2018-09-271-2/+3
|\ \ \ | |_|/ |/| |
| * | Re-enable upload button after updating Avatar fixes #8623Tobia De Koninck2018-08-241-2/+3
* | | Merge pull request #11411 from nextcloud/fix-checkWellKnownUrl-not-being-exec...Morris Jobke2018-09-271-2/+2
|\ \ \
| * | | Fix "checkWellKnownUrl" not being runDaniel Calviño Sánchez2018-09-271-2/+2
| | |/ | |/|
* | | Merge pull request #11384 from nextcloud/11372/fix/logo-heightRoeland Jago Douma2018-09-271-3/+3
|\ \ \ | |/ / |/| |
| * | Fixes the logo heightMichael Weimann2018-09-271-3/+3
|/ /
* | Merge pull request #11398 from nextcloud/refactor/settings-manager-complexityChristoph Wurst2018-09-273-150/+62
|\ \
| * | Remove unused constructor argumentChristoph Wurst2018-09-273-11/+0
| * | Reduce settings manager complexity by loading sections via DIChristoph Wurst2018-09-273-140/+63
* | | Merge pull request #11163 from nextcloud/refactor/vue-backup-codesChristoph Wurst2018-09-2715-224/+4890
|\| |
| * | Fix generate button event and show regenerate button only when enabledChristoph Wurst2018-09-273-27/+30
| * | Bump npm packagesRoeland Jago Douma2018-09-273-435/+314
| * | Add drone supportRoeland Jago Douma2018-09-271-0/+8
| * | Move to standard formatRoeland Jago Douma2018-09-2715-43/+87
| * | Migrate backup codes settings to VueChristoph Wurst2018-09-2713-223/+4955
|/ /
* | Merge pull request #11402 from nextcloud/fix_acceptanceChristoph Wurst2018-09-271-5/+5
|\ \
| * | Also test enabling of the Antivirus App for filesRoeland Jago Douma2018-09-261-5/+5
* | | [tx-robot] updated from transifexNextcloud bot2018-09-27138-144/+288
|/ /
* | Merge pull request #11135 from nextcloud/babel-npm-webpack-fixesRoeland Jago Douma2018-09-266-942/+1303
|\ \
| * | Rebase and bumpJohn Molakvoæ (skjnldsv)2018-09-262-494/+310
| * | Merge branch 'master' into babel-npm-webpack-fixesJohn Molakvoæ (skjnldsv)2018-09-26411-3312/+5919
| |\ \
| * | | Update config and babel for ie11John Molakvoæ (skjnldsv)2018-09-106-822/+1219
* | | | Merge pull request #11150 from nextcloud/feature/noid/unit-test-find-webrootblizzz2018-09-262-20/+74
|\ \ \ \
| * | | | Change visibility to privateDaniel Kesselberg2018-09-132-2/+2
| * | | | Restore previous state for OC::$CLIDaniel Kesselberg2018-09-111-0/+3
| * | | | Change return false to throw newDaniel Kesselberg2018-09-102-10/+22
| * | | | Extract logic for webroot into method and add testDaniel Kesselberg2018-09-102-18/+57
* | | | | Merge pull request #11112 from nextcloud/do-not-hide-the-progress-bar-while-t...Morris Jobke2018-09-261-1/+48
|\ \ \ \ \
| * | | | | Do not hide the progress bar while the chunked upload is being assembledDaniel Calviño Sánchez2018-09-071-1/+48
* | | | | | Merge pull request #11383 from nextcloud/fix/noid/files-unavailable-deleted-userMorris Jobke2018-09-261-1/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | do not explode when getting permissions from a FailedStorageArthur Schiwon2018-09-261-1/+9
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2634-64/+66
* | | | | Merge pull request #11240 from nextcloud/feature/noid/consider-openssl-settin...Morris Jobke2018-09-252-2/+3
|\ \ \ \ \