summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-09-2634-64/+66
|
* Merge pull request #11240 from ↵Morris Jobke2018-09-252-2/+3
|\ | | | | | | | | nextcloud/feature/noid/consider-openssl-settings-from-config.php Consider openssl settings from config.php
| * Add openssl to mockDaniel Kesselberg2018-09-161-0/+1
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Consider openssl settings from config.phpDaniel Kesselberg2018-09-161-2/+2
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #11316 from nextcloud/container-queryexception-onlyRoeland Jago Douma2018-09-251-7/+1
|\ \ | | | | | | only catch QueryException when trying to build class
| * | only catch QueryException when trying to build classRobin Appelman2018-09-211-7/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #11123 from CrazyEasy/patch-1Roeland Jago Douma2018-09-251-2/+2
|\ \ \ | | | | | | | | Bugfix 2FA theme: buttons white
| * | | 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
|\ \ \ \ | | | | | | | | | | [Mandatory 2FA] occ commands revamp
| * | | | Only allow 2FA state changs if providers support the operationChristoph Wurst2018-09-2521-173/+747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref https://github.com/nextcloud/server/issues/11019. Add `twofactorauth:cleanup` command Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #11309 from ↵Roeland Jago Douma2018-09-251-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/dont-ignore-cloud-federation-api Do not ignore cloud_federation_api
| * | | | | Do not ignore cloud_federation_apiJoas Schilling2018-09-211-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #11363 from nextcloud/update/npm/updatenotificationsRoeland Jago Douma2018-09-254-38/+33
|\ \ \ \ \ | | | | | | | | | | | | [npm] Bump updatenotifications
| * | | | | [npm] Bump updatenotificationsRoeland Jago Douma2018-09-254-38/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #11368 from nextcloud/content-list-flex-fixesRoeland Jago Douma2018-09-252-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix default flex shrink on list
| * | | | | | Fix default flex shrink on listJohn Molakvoæ (skjnldsv)2018-09-252-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #11364 from nextcloud/update/npm/accessibilityMorris Jobke2018-09-252-511/+305
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [npm] Bump accessibility
| * | | | | | | [npm] Bump accessibilityRoeland Jago Douma2018-09-252-511/+305
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #11365 from nextcloud/update/npm/settingsMorris Jobke2018-09-253-448/+300
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [npm] Bump settings
| * | | | | | | [npm] Bump settingsRoeland Jago Douma2018-09-253-448/+300
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #11362 from nextcloud/update/npm/oauth2Morris Jobke2018-09-252-452/+293
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [npm] Bump oauth2
| * | | | | | [npm] Bump oauth2Roeland Jago Douma2018-09-252-452/+293
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #11297 from nextcloud/bugfix/noid/this-database-dudeRoeland Jago Douma2018-09-252-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Copy the expiration from 480864b3e32d88361b17b70d238f986f64579757 to …
| * | | | | Also adjust the expiration of PublicKeyTokenProviderJoas Schilling2018-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Copy the expiration from 480864b3e32d88361b17b70d238f986f64579757 to ↵Joas Schilling2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getTokenById Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #11249 from ↵Roeland Jago Douma2018-09-252-19/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.4.2 Bump vue-loader from 15.2.6 to 15.4.2 in /apps/oauth2
| * | | | | | Bump vue-loader from 15.2.6 to 15.4.2 in /apps/oauth2dependabot[bot]2018-09-242-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.2.6 to 15.4.2. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | | | [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 findLanguageFromLocale
| * | | | | | Add simple unit test for findLanguageFromLocaleDaniel Kesselberg2018-09-231-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | Merge pull request #11222 from nextcloud/gs-and-samlblizzz2018-09-241-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | make the server ready to use global scale with SAML as auth back-end
| * | | | | | add back-end as parameter to the pre-login hookBjoern Schiessle2018-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for the Global Scale setup to allow the master node to perform different operations during login, depending on the user management. Because in case of SAML, the authentication at the idp happens at the master node. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #11342 from ↵Joas Schilling2018-09-242-241/+139
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.1.1 Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotification
| * | | | | | | Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotificationdependabot[bot]2018-09-242-241/+139
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits/v3.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | / / / / / [tx-robot] updated from transifexNextcloud bot2018-09-246-112/+112
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2322-42/+298
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2244-150/+466
| |_|/ / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2152-80/+186
| | | | |
* | | | | Merge pull request #11228 from nextcloud/fix/11144/empty-favorite-namesJoas Schilling2018-09-202-5/+70
|\ \ \ \ \ | | | | | | | | | | | | Fixes empty favorite names for trailing slashes
| * | | | | Fixes empty favorite names for trailing slashesMichael Weimann2018-09-192-5/+70
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2018-0/+22
| | | | | |
* | | | | | Merge pull request #11292 from ↵blizzz2018-09-191-2/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | nextcloud/revert/9442/do-not-apcu-cache-the-autoloader Revert "Use APCu caching of composer"
| * | | | | Revert "Use APCu caching of composer"Joas Schilling2018-09-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 948ab8a4d06b3821ab94c11a3a04c820e60d6c8a. For details why see https://github.com/nextcloud/server/issues/11290
* | | | | | Merge pull request #11134 from nextcloud/locale-template-fixJoas Schilling2018-09-193-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use user locale as default in the template
| * | | | | | Fix since tagJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fallback to $lang if no $locale matchJohn Molakvoæ (skjnldsv)2018-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | TypehintJohn Molakvoæ (skjnldsv)2018-09-102-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Since requirementJohn Molakvoæ (skjnldsv)2018-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix public l10nJohn Molakvoæ (skjnldsv)2018-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 11:34:50 +0000