Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #12545 from nextcloud/backport/12543/stable14 | Roeland Jago Douma | 2018-11-20 | 1 | -0/+4 | |
|\ \ \ | |/ / |/| | | [stable14] Bearer tokens are app token | |||||
| * | | Bearer tokens are app token | Roeland Jago Douma | 2018-11-20 | 1 | -0/+4 | |
|/ / | | | | | | | | | | | | | | | | | | | Fixes #12498 This means that we set that it is a proper app token once it is validated. This will allow the 2FA middleware to just run the same check. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | |||||
* | | Merge pull request #12533 from nextcloud/version/noid/14.0.4rc2v14.0.4RC2 | Morris Jobke | 2018-11-20 | 1 | -2/+2 | |
|\ \ | | | | | | | 14.0.4 RC 2 | |||||
| * | | 14.0.4 RC 2 | Morris Jobke | 2018-11-20 | 1 | -2/+2 | |
|/ / | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | | Merge pull request #12542 from nextcloud/stb14-settings-svg-icons-scss-fix | Morris Jobke | 2018-11-20 | 1 | -1/+0 | |
|\ \ | | | | | | | Remove unused svg api route | |||||
| * | | Remove unused sg api route | John Molakvoæ (skjnldsv) | 2018-11-20 | 1 | -1/+0 | |
|/ / | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* / | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-20 | 108 | -208/+256 | |
|/ | ||||||
* | Merge pull request #12529 from nextcloud/backport/12401/php-warning | Roeland Jago Douma | 2018-11-19 | 2 | -1/+34 | |
|\ | | | | | [stable14] Fix the warning appearing in the admin section when mail_smtpmode is not configured | |||||
| * | Use the proper default values | Morris Jobke | 2018-11-19 | 2 | -3/+3 | |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
| * | Verify that isPhpMailerUsed uses config as expected | Kyle Fazzari | 2018-11-19 | 1 | -0/+33 | |
| | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com> | |||||
| * | Fix the warning appearing check setup when mail_smtpmode is not configured. | Marc Peña Segarra | 2018-11-19 | 1 | -1/+1 | |
|/ | | | | Closes #11107 | |||||
* | Merge pull request #12502 from nextcloud/swift-object-not-found-14 | Morris Jobke | 2018-11-19 | 3 | -6/+28 | |
|\ | | | | | [14] forward object not found error in swift as dav 404 | |||||
| * | forward object not found error in swift as dav 404 | Robin Appelman | 2018-11-19 | 3 | -6/+28 | |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-19 | 8 | -0/+70 | |
| | | ||||||
* | | Merge pull request #12492 from nextcloud/stable14-12489 | Roeland Jago Douma | 2018-11-18 | 1 | -2/+1 | |
|\ \ | | | | | | | [stable14] Only use width and opacity for transition | |||||
| * | | Only use width and opacity for transition | Julius Härtl | 2018-11-16 | 1 | -2/+1 | |
| |/ | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-18 | 38 | -2/+370 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-17 | 376 | -3428/+3440 | |
|/ | ||||||
* | Merge pull request #12482 from nextcloud/share-menu-click-fix | Morris Jobke | 2018-11-16 | 1 | -5/+3 | |
|\ | | | | | Fix wrong share popover opening on share link | |||||
| * | Fix wrong share popover opening on share link | John Molakvoæ (skjnldsv) | 2018-11-16 | 1 | -5/+3 | |
|/ | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-16 | 32 | -2/+92 | |
| | ||||||
* | Merge pull request #12436 from nextcloud/version/noid/14.0.4RC1v14.0.4RC1 | Morris Jobke | 2018-11-15 | 21 | -22/+22 | |
|\ | | | | | 14.0.4 RC 1 | |||||
| * | 14.0.4 RC 1 | Morris Jobke | 2018-11-15 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
| * | Update autoloader dump | Morris Jobke | 2018-11-15 | 20 | -20/+20 | |
|/ | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | Merge pull request #12459 from nextcloud/bugfix-stable14/dav_shares_hickup | Morris Jobke | 2018-11-15 | 4 | -32/+36 | |
|\ | | | | | [stable14] fixes dav share issue with owner | |||||
| * | fix caldav tests | Georg Ehrke | 2018-11-15 | 2 | -18/+18 | |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | |||||
| * | fixes dav share issue with owner | Georg Ehrke | 2018-11-14 | 2 | -14/+18 | |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-15 | 52 | -86/+576 | |
|/ | ||||||
* | Merge pull request #12441 from nextcloud/stable14-10888 | Morris Jobke | 2018-11-14 | 2 | -0/+18 | |
|\ | | | | | [stable14] Fix missing quickaccess favorite folder on add | |||||
| * | Update PHPDoc to fix typos | Morris Jobke | 2018-11-14 | 1 | -2/+3 | |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
| * | fix for favorites-quickaccess: newly added folders dont show up when added ↵ | Felix Nüsse | 2018-11-13 | 2 | -0/+17 | |
| | | | | | | | | | | | | to favorites Signed-off-by: fnuesse <felix.nuesse@t-online.de> | |||||
* | | Merge pull request #12432 from nextcloud/stb14-accessibility-cache-fixes | Morris Jobke | 2018-11-14 | 8 | -20/+52 | |
|\ \ | | | | | | | [stable14] Added cache override to ensure an always up-to-date accessibility css | |||||
| * | | Added cache override to ensure an always up-to-date accessibility css | John Molakvoæ (skjnldsv) | 2018-11-13 | 8 | -20/+52 | |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-14 | 18 | -6/+614 | |
| |/ |/| | ||||||
* | | Merge pull request #12440 from nextcloud/stable14-10890 | Morris Jobke | 2018-11-13 | 2 | -4/+9 | |
|\ \ | | | | | | | [stable14] Fix app menu calculation for random size of the right header | |||||
| * | | Fix app menu calculation for random size of the right header | Julius Härtl | 2018-11-13 | 2 | -4/+9 | |
|/ / | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | |||||
* | | Merge pull request #12372 from ↵ | Morris Jobke | 2018-11-13 | 1 | -2/+3 | |
|\ \ | | | | | | | | | | | | | nextcloud/suppress-wrong-audit-log-message-stable14 [stable14] suppress wrong audit log messages about failed login attempts | |||||
| * | | first check if the user is already logged in and then try to authenticate ↵ | Bjoern Schiessle | 2018-11-09 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | via apache, this way we suppress wrong audit log messages about failed login attempts Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
* | | | Merge pull request #12375 from nextcloud/backport/12284/stable14 | Morris Jobke | 2018-11-13 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | [14] Properly search the root of a shared external storage | |||||
| * | | | Properly search the root of a shared external storage | Roeland Jago Douma | 2018-11-09 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1020 When an external storage is shared with you in full the root is '' (empty). This adds an extra check for an empty jail basically. Because if the jail is on the empty string. It matches all paths. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | |||||
* | | | Merge pull request #12431 from nextcloud/stb14-ie11-width-fix | Morris Jobke | 2018-11-13 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix IE rule for min width | |||||
| * | | | Fix IE rule for min width | John Molakvoæ (skjnldsv) | 2018-11-13 | 1 | -1/+1 | |
| | |/ | |/| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* | | | Merge pull request #12433 from ↵ | Morris Jobke | 2018-11-13 | 2 | -8/+30 | |
|\ \ \ | |/ / |/| | | | | | | | | nextcloud/backport/12411-12413/unique-constraint-fix [stable14] Unique contraint and deadlock fixes for filecache and file_locks | |||||
| * | | Fix UniqueConstraintViolationException while insert into oc_file_locks | Morris Jobke | 2018-11-13 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #9305 by not being prone to the race condition in insertIfNotExists * fixes #6899 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block * followup to #12371 Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
| * | | Fix UniqueConstraintViolationException while insert into oc_filecache | Morris Jobke | 2018-11-13 | 1 | -7/+18 | |
|/ / | | | | | | | | | | | | | | | * fixes #6160 by not being prone to the race condition in insertIfNotExists * fixes #12228 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-11-13 | 256 | -288/+336 | |
| | | ||||||
* | | Merge pull request #12416 from nextcloud/stb14-admin-vue-approval-fix | Morris Jobke | 2018-11-12 | 6 | -45/+26 | |
|\ \ | | | | | | | [stable14] Use nextcloud-password-confirmation | |||||
| * | | Use nextcloud-password-confirmation | John Molakvoæ (skjnldsv) | 2018-11-12 | 6 | -45/+26 | |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* | | | Merge pull request #12412 from nextcloud/backport/12358/fix-update-check | Morris Jobke | 2018-11-12 | 8 | -23/+35 | |
|\ \ \ | |/ / |/| | | [stable14] Fix app update available check | |||||
| * | | Adjust unit tests | Joas Schilling | 2018-11-12 | 2 | -7/+11 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> |