summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Add openssl to mockDaniel Kesselberg2018-09-161-0/+1
| * | | | Consider openssl settings from config.phpDaniel Kesselberg2018-09-161-2/+2
* | | | | Merge pull request #11316 from nextcloud/container-queryexception-onlyRoeland Jago Douma2018-09-251-7/+1
|\ \ \ \ \
| * | | | | only catch QueryException when trying to build classRobin Appelman2018-09-211-7/+1
* | | | | | Merge pull request #11123 from CrazyEasy/patch-1Roeland Jago Douma2018-09-251-2/+2
|\ \ \ \ \ \
| * | | | | | Used CSS VariablesEASY2018-09-101-2/+2
| * | | | | | Update theming.scssEASY2018-09-091-2/+2
* | | | | | | Merge pull request #11143 from nextcloud/feature/2fa-occ-revampRoeland Jago Douma2018-09-2521-173/+747
|\ \ \ \ \ \ \
| * | | | | | | Only allow 2FA state changs if providers support the operationChristoph Wurst2018-09-2521-173/+747
* | | | | | | | Merge pull request #11309 from nextcloud/bugfix/noid/dont-ignore-cloud-federa...Roeland Jago Douma2018-09-251-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not ignore cloud_federation_apiJoas Schilling2018-09-211-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #11363 from nextcloud/update/npm/updatenotificationsRoeland Jago Douma2018-09-254-38/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | [npm] Bump updatenotificationsRoeland Jago Douma2018-09-254-38/+33
* | | | | | | | | Merge pull request #11368 from nextcloud/content-list-flex-fixesRoeland Jago Douma2018-09-252-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix default flex shrink on listJohn Molakvoæ (skjnldsv)2018-09-252-2/+4
* | | | | | | | | | Merge pull request #11364 from nextcloud/update/npm/accessibilityMorris Jobke2018-09-252-511/+305
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [npm] Bump accessibilityRoeland Jago Douma2018-09-252-511/+305
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #11365 from nextcloud/update/npm/settingsMorris Jobke2018-09-253-448/+300
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [npm] Bump settingsRoeland Jago Douma2018-09-253-448/+300
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #11362 from nextcloud/update/npm/oauth2Morris Jobke2018-09-252-452/+293
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | [npm] Bump oauth2Roeland Jago Douma2018-09-252-452/+293
| |/ / / / / / / /
* | | | | | | | | Merge pull request #11297 from nextcloud/bugfix/noid/this-database-dudeRoeland Jago Douma2018-09-252-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Also adjust the expiration of PublicKeyTokenProviderJoas Schilling2018-09-201-2/+2
| * | | | | | | | Copy the expiration from 480864b3e32d88361b17b70d238f986f64579757 to getToken...Joas Schilling2018-09-191-1/+1
* | | | | | | | | Merge pull request #11249 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-09-252-19/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump vue-loader from 15.2.6 to 15.4.2 in /apps/oauth2dependabot[bot]2018-09-242-19/+24
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2546-420/+512
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #11337 from nextcloud/feature/noid/add-test-for-11134Morris Jobke2018-09-241-0/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add simple unit test for findLanguageFromLocaleDaniel Kesselberg2018-09-231-0/+27
* | | | | | | | | | Merge pull request #11222 from nextcloud/gs-and-samlblizzz2018-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | add back-end as parameter to the pre-login hookBjoern Schiessle2018-09-141-1/+1
* | | | | | | | | | Merge pull request #11342 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Joas Schilling2018-09-242-241/+139
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotificationdependabot[bot]2018-09-242-241/+139
|/ / / / / / / / / /
* | / / / / / / / / [tx-robot] updated from transifexNextcloud bot2018-09-246-112/+112
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2322-42/+298
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 20:49:59 +0000