]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoFix redis-cluster support on drone
Morris Jobke [Wed, 9 Aug 2017 12:29:42 +0000 (14:29 +0200)]
Fix redis-cluster support on drone

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate syntax to drone 0.8
Morris Jobke [Wed, 9 Aug 2017 09:10:21 +0000 (11:10 +0200)]
Update syntax to drone 0.8

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 9 Aug 2017 00:08:30 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5978 from nextcloud/12-5908
Morris Jobke [Tue, 8 Aug 2017 17:23:35 +0000 (19:23 +0200)]
Merge pull request #5978 from nextcloud/12-5908

[stable12] Add css class for toogle preview icon

7 years agoMerge pull request #5979 from nextcloud/12-5738
Morris Jobke [Tue, 8 Aug 2017 17:23:12 +0000 (19:23 +0200)]
Merge pull request #5979 from nextcloud/12-5738

[stable12] Improve spelling in LDAP

7 years agoMerge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-of-loadi...
Morris Jobke [Tue, 8 Aug 2017 16:42:31 +0000 (18:42 +0200)]
Merge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app

[stable12] Fix vertical alignment of loading icon and status message in Theming app

7 years agoMerge pull request #5946 from nextcloud/12-5897
Morris Jobke [Tue, 8 Aug 2017 14:36:46 +0000 (16:36 +0200)]
Merge pull request #5946 from nextcloud/12-5897

[stable12] Send an email once a file/folder is shared with a user

7 years agoMerge pull request #5966 from nextcloud/backport-oracle
Morris Jobke [Tue, 8 Aug 2017 14:34:25 +0000 (16:34 +0200)]
Merge pull request #5966 from nextcloud/backport-oracle

[stable12] Fix oracle db

7 years agoMerge pull request #5937 from nextcloud/backend-can-be-wrong---sometimes
Morris Jobke [Tue, 8 Aug 2017 14:18:56 +0000 (16:18 +0200)]
Merge pull request #5937 from nextcloud/backend-can-be-wrong---sometimes

display error icon on non-success

7 years agoMerge pull request #5914 from nextcloud/12-5913
Morris Jobke [Tue, 8 Aug 2017 08:41:47 +0000 (10:41 +0200)]
Merge pull request #5914 from nextcloud/12-5913

[stable12] Fix anchor name for federated sharing settings

7 years agoMerge pull request #5945 from nextcloud/stable12_5836
Morris Jobke [Tue, 8 Aug 2017 08:41:05 +0000 (10:41 +0200)]
Merge pull request #5945 from nextcloud/stable12_5836

[stable12] Empty search no longer works

7 years agoMerge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness...
Morris Jobke [Tue, 8 Aug 2017 08:40:37 +0000 (10:40 +0200)]
Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness-correction

[stable12] Use same lightness calculation as the SCSS compiler for theming

7 years agoMerge pull request #5925 from derkostka/patch-1
Morris Jobke [Tue, 8 Aug 2017 08:40:09 +0000 (10:40 +0200)]
Merge pull request #5925 from derkostka/patch-1

[stable12] Removed cast to integer in getSize

7 years agoMerge pull request #6001 from nextcloud/backport-5695-dont-throw-when-table-is-missing
Joas Schilling [Tue, 8 Aug 2017 08:30:45 +0000 (10:30 +0200)]
Merge pull request #6001 from nextcloud/backport-5695-dont-throw-when-table-is-missing

[stable12] Don't throw an error when the table doesn't exist

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 8 Aug 2017 00:08:19 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoFix code style 6008/head
Daniel Calviño Sánchez [Sat, 20 May 2017 20:41:23 +0000 (22:41 +0200)]
Fix code style

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoRemove superfluous selector part
Daniel Calviño Sánchez [Sat, 20 May 2017 20:30:02 +0000 (22:30 +0200)]
Remove superfluous selector part

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAlign vertically loading icon and status message
Daniel Calviño Sánchez [Sat, 20 May 2017 20:26:58 +0000 (22:26 +0200)]
Align vertically loading icon and status message

As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoDo not use the same rules for loading icon than for upload icon
Daniel Calviño Sánchez [Sat, 20 May 2017 20:10:06 +0000 (22:10 +0200)]
Do not use the same rules for loading icon than for upload icon

When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case; in general the loading icon is
used in a totally different way than the upload icon and thus it should
not share its CSS rules.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoRemove ignored rules
Daniel Calviño Sánchez [Sat, 20 May 2017 20:05:39 +0000 (22:05 +0200)]
Remove ignored rules

The removed rules were either always overriden by other rules or never
used due to not matching any element.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoDon't throw an error when the table doesn't exist 6001/head
Joas Schilling [Wed, 12 Jul 2017 13:35:24 +0000 (15:35 +0200)]
Don't throw an error when the table doesn't exist

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5989 from nextcloud/final-version-bump-stable12 v12.0.1
Lukas Reschke [Sun, 6 Aug 2017 18:25:21 +0000 (20:25 +0200)]
Merge pull request #5989 from nextcloud/final-version-bump-stable12

Bump version to 12.0.1.5

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 6 Aug 2017 00:08:33 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoBump version to 12.0.5 5989/head
Lukas Reschke [Sat, 5 Aug 2017 10:59:53 +0000 (12:59 +0200)]
Bump version to 12.0.5

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 5 Aug 2017 00:08:19 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoUse same lightness calculation as the SCSS compiler for theming 5984/head
Julius Härtl [Tue, 1 Aug 2017 17:09:07 +0000 (18:09 +0100)]
Use same lightness calculation as the SCSS compiler for theming

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMerge pull request #5983 from nextcloud/revert-5977-stable12-theming-lightness-correction v12.0.1RC5
Lukas Reschke [Fri, 4 Aug 2017 13:39:15 +0000 (15:39 +0200)]
Merge pull request #5983 from nextcloud/revert-5977-stable12-theming-lightness-correction

Revert "[stable12] theming lightness correction"

7 years agoRevert "[stable12] theming lightness correction" 5983/head
Lukas Reschke [Fri, 4 Aug 2017 13:38:56 +0000 (15:38 +0200)]
Revert "[stable12] theming lightness correction"

7 years agoMerge pull request #5977 from nextcloud/stable12-theming-lightness-correction
Lukas Reschke [Fri, 4 Aug 2017 13:38:08 +0000 (15:38 +0200)]
Merge pull request #5977 from nextcloud/stable12-theming-lightness-correction

[stable12] theming lightness correction

7 years agoMerge pull request #5976 from nextcloud/12.0.1rc5
Lukas Reschke [Fri, 4 Aug 2017 13:35:57 +0000 (15:35 +0200)]
Merge pull request #5976 from nextcloud/12.0.1rc5

v12.0.1RC5

7 years agoImprove spelling in LDAP 5979/head
Allan Nordhøy [Fri, 14 Jul 2017 13:38:11 +0000 (15:38 +0200)]
Improve spelling in LDAP

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd css class for toogle preview icon 5978/head
Morris Jobke [Thu, 27 Jul 2017 15:13:12 +0000 (17:13 +0200)]
Add css class for toogle preview icon

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUse same lightness calculation as the SCSS compiler for theming 5977/head
Julius Härtl [Tue, 1 Aug 2017 17:09:07 +0000 (18:09 +0100)]
Use same lightness calculation as the SCSS compiler for theming

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agov12.0.1RC5 5976/head
Lukas Reschke [Fri, 4 Aug 2017 09:11:10 +0000 (11:11 +0200)]
v12.0.1RC5

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 4 Aug 2017 00:08:27 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoAdd a method to compare empty strings with an expression 5966/head
Joas Schilling [Tue, 25 Jul 2017 13:34:59 +0000 (15:34 +0200)]
Add a method to compare empty strings with an expression

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix repair step for oracle...
Joas Schilling [Tue, 25 Jul 2017 10:22:28 +0000 (12:22 +0200)]
Fix repair step for oracle...

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix last failures with oracle
Joas Schilling [Mon, 24 Jul 2017 16:05:08 +0000 (18:05 +0200)]
Fix last failures with oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix querybuilder and functionbuilder tests
Joas Schilling [Mon, 24 Jul 2017 10:01:35 +0000 (12:01 +0200)]
Fix querybuilder and functionbuilder tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix ILIKE regex for oracle
Joas Schilling [Mon, 24 Jul 2017 09:39:53 +0000 (11:39 +0200)]
Fix ILIKE regex for oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix auth provider
Joas Schilling [Mon, 24 Jul 2017 09:18:46 +0000 (11:18 +0200)]
Fix auth provider

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse selectAlias()
Joas Schilling [Sat, 22 Jul 2017 10:48:10 +0000 (12:48 +0200)]
Use selectAlias()

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoCan not insert auto increment on oracle
Joas Schilling [Sat, 22 Jul 2017 10:21:00 +0000 (12:21 +0200)]
Can not insert auto increment on oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix missing escape on column and table name
Joas Schilling [Fri, 21 Jul 2017 12:45:49 +0000 (14:45 +0200)]
Fix missing escape on column and table name

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix clob comparison
Joas Schilling [Fri, 21 Jul 2017 12:44:35 +0000 (14:44 +0200)]
Fix clob comparison

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAllow to specify the table space on occ
Joas Schilling [Fri, 21 Jul 2017 09:17:12 +0000 (11:17 +0200)]
Allow to specify the table space on occ

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoQuote aliases as well
Joas Schilling [Thu, 20 Jul 2017 18:14:31 +0000 (20:14 +0200)]
Quote aliases as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoOracle does not support PDO::FETCH_KEY_PAIR
Joas Schilling [Thu, 20 Jul 2017 18:13:35 +0000 (20:13 +0200)]
Oracle does not support PDO::FETCH_KEY_PAIR

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 3 Aug 2017 00:08:15 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoDisable default activity email for incoming shares 5946/head
Morris Jobke [Mon, 31 Jul 2017 06:19:54 +0000 (08:19 +0200)]
Disable default activity email for incoming shares

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 2 Aug 2017 00:08:21 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoSend an email once a file/folder is shared with a user
Morris Jobke [Wed, 26 Jul 2017 21:53:07 +0000 (23:53 +0200)]
Send an email once a file/folder is shared with a user

* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoEmpty search no longer works 5945/head
Roeland Jago Douma [Sat, 22 Jul 2017 12:37:55 +0000 (14:37 +0200)]
Empty search no longer works

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agonow, with less CSS 5937/head
Maxence Lange [Tue, 1 Aug 2017 01:23:58 +0000 (03:23 +0200)]
now, with less CSS

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 1 Aug 2017 00:08:35 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agodisplay error icon on non-success
Maxence Lange [Mon, 31 Jul 2017 13:22:25 +0000 (15:22 +0200)]
display error icon on non-success

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 31 Jul 2017 00:08:12 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5924 from nextcloud/12.0.1rc4 v12.0.1RC4
Lukas Reschke [Sun, 30 Jul 2017 13:39:19 +0000 (15:39 +0200)]
Merge pull request #5924 from nextcloud/12.0.1rc4

12.0.1RC4

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 30 Jul 2017 00:08:13 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[Stable 12] Removed cast to integer in getSize 5925/head
Sebastian Kostka [Sat, 29 Jul 2017 05:40:13 +0000 (07:40 +0200)]
[Stable 12] Removed cast to integer in getSize

Fixes - Wrong or no sizes of files/folders #5031 for 32-bit systems a direct cast to integer causes problems.
Backport from #5744

Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 29 Jul 2017 00:08:40 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago12.0.1RC4 5924/head
Lukas Reschke [Fri, 28 Jul 2017 14:03:36 +0000 (16:03 +0200)]
12.0.1RC4

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #5919 from nextcloud/add-brackets-on-concat-method
Lukas Reschke [Fri, 28 Jul 2017 13:35:49 +0000 (15:35 +0200)]
Merge pull request #5919 from nextcloud/add-brackets-on-concat-method

Add brackets around concat statements so comparing the result works a…

7 years agoAdd brackets around concat statements so comparing the result works as intended 5919/head
Joas Schilling [Fri, 28 Jul 2017 09:34:35 +0000 (11:34 +0200)]
Add brackets around concat statements so comparing the result works as intended

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix anchor name for federated sharing settings 5914/head
Morris Jobke [Fri, 28 Jul 2017 06:21:25 +0000 (08:21 +0200)]
Fix anchor name for federated sharing settings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 28 Jul 2017 00:08:14 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5902 from nextcloud/oc-migration v12.0.1RC3
Morris Jobke [Thu, 27 Jul 2017 15:25:21 +0000 (17:25 +0200)]
Merge pull request #5902 from nextcloud/oc-migration

Add a repair step to drop the account_terms table on oc migration

7 years agoMerge pull request #5896 from nextcloud/12-5895
Morris Jobke [Thu, 27 Jul 2017 11:26:17 +0000 (13:26 +0200)]
Merge pull request #5896 from nextcloud/12-5895

[stable12] Fix show password button for password change

7 years agoUse the existing array of OC versions 5902/head
Joas Schilling [Thu, 27 Jul 2017 10:07:51 +0000 (12:07 +0200)]
Use the existing array of OC versions

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoThis is RC3
Lukas Reschke [Thu, 27 Jul 2017 09:49:16 +0000 (11:49 +0200)]
This is RC3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd a repair step to drop the account_terms table on oc migration
Joas Schilling [Thu, 27 Jul 2017 09:27:25 +0000 (11:27 +0200)]
Add a repair step to drop the account_terms table on oc migration

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 27 Jul 2017 00:08:13 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoFix show password button for password change 5896/head
Morris Jobke [Wed, 26 Jul 2017 20:54:23 +0000 (22:54 +0200)]
Fix show password button for password change

* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #5883 from nextcloud/12-5871
Morris Jobke [Wed, 26 Jul 2017 20:31:20 +0000 (22:31 +0200)]
Merge pull request #5883 from nextcloud/12-5871

[stable12] Enable postgres on drone again

7 years agoMerge pull request #5889 from nextcloud/stable12-overlay-on-show-password v12.0.1RC2
Lukas Reschke [Wed, 26 Jul 2017 14:55:34 +0000 (16:55 +0200)]
Merge pull request #5889 from nextcloud/stable12-overlay-on-show-password

fix overlay on show password

7 years agoMerge pull request #5875 from nextcloud/stable12-edu-edition
Morris Jobke [Wed, 26 Jul 2017 14:47:32 +0000 (16:47 +0200)]
Merge pull request #5875 from nextcloud/stable12-edu-edition

[stable12] Add new bundle

7 years agofix overlay on show password 5889/head
Maxence Lange [Wed, 26 Jul 2017 14:18:57 +0000 (16:18 +0200)]
fix overlay on show password

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
7 years agoEnable postgres on drone again 5883/head
Morris Jobke [Tue, 25 Jul 2017 11:39:43 +0000 (13:39 +0200)]
Enable postgres on drone again

* use proper password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd new bundle 5875/head
Lukas Reschke [Tue, 25 Jul 2017 13:46:21 +0000 (15:46 +0200)]
Add new bundle

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 26 Jul 2017 00:08:14 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5851 from nextcloud/make-it-rc2
Lukas Reschke [Tue, 25 Jul 2017 08:28:17 +0000 (10:28 +0200)]
Merge pull request #5851 from nextcloud/make-it-rc2

v12.0.1 RC2

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 25 Jul 2017 00:08:13 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agov12.0.1 RC2 5851/head
Lukas Reschke [Mon, 24 Jul 2017 08:42:33 +0000 (10:42 +0200)]
v12.0.1 RC2

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #5858 from nextcloud/12-5850
Morris Jobke [Mon, 24 Jul 2017 14:16:16 +0000 (16:16 +0200)]
Merge pull request #5858 from nextcloud/12-5850

[stable12] proper logo height in emails for Outlook

7 years agoRemove unneeded styles 5858/head
Morris Jobke [Mon, 24 Jul 2017 09:09:14 +0000 (11:09 +0200)]
Remove unneeded styles

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdjust to height=120
Lukas Reschke [Mon, 24 Jul 2017 08:17:12 +0000 (10:17 +0200)]
Adjust to height=120

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 24 Jul 2017 00:08:13 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5830 from nextcloud/12-5812
Roeland Jago Douma [Sun, 23 Jul 2017 12:05:17 +0000 (14:05 +0200)]
Merge pull request #5830 from nextcloud/12-5812

[stable12] Fix for mb strlen

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 23 Jul 2017 00:08:07 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoadd tests for renaming paths with multibyte utf8 characters 5830/head
Robin Appelman [Fri, 21 Jul 2017 12:25:38 +0000 (14:25 +0200)]
add tests for renaming paths with multibyte utf8 characters

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoFix for mb strlen
Artem Kochnev [Thu, 20 Jul 2017 14:29:50 +0000 (17:29 +0300)]
Fix for mb strlen

Error with moving files with long names in UTF-8

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 22 Jul 2017 00:08:16 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5826 from nextcloud/12-backport-5821
Morris Jobke [Fri, 21 Jul 2017 21:35:46 +0000 (23:35 +0200)]
Merge pull request #5826 from nextcloud/12-backport-5821

[stable12] Fix error message on untrusted domain error page

7 years agoMerge pull request #5757 from nextcloud/mount-rename-12
Morris Jobke [Fri, 21 Jul 2017 21:30:42 +0000 (23:30 +0200)]
Merge pull request #5757 from nextcloud/mount-rename-12

[12]  Fix renaming of non-renamble mounts

7 years agoFix error message on untrusted domain error page 5826/head
Morris Jobke [Fri, 21 Jul 2017 09:46:35 +0000 (11:46 +0200)]
Fix error message on untrusted domain error page

Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #5786 from nextcloud/path-repair-steps-storage-12
Morris Jobke [Fri, 21 Jul 2017 12:03:38 +0000 (14:03 +0200)]
Merge pull request #5786 from nextcloud/path-repair-steps-storage-12

[12] Also repair storage id's when repairing invalid entries

7 years agoMerge pull request #5754 from nextcloud/fed-unshare-fail-remote-12
Roeland Jago Douma [Fri, 21 Jul 2017 10:46:31 +0000 (12:46 +0200)]
Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12

[12] still remove the federated share even if we cant notify the remote

7 years agoMerge pull request #5792 from nextcloud/stable12-prevent-php7.2-usage
Roeland Jago Douma [Fri, 21 Jul 2017 10:38:35 +0000 (12:38 +0200)]
Merge pull request #5792 from nextcloud/stable12-prevent-php7.2-usage

[stable12] Show warning if PHP 7.2 is used

7 years agoMerge pull request #5805 from nextcloud/fix-public-links-stable12
Roeland Jago Douma [Fri, 21 Jul 2017 09:02:02 +0000 (11:02 +0200)]
Merge pull request #5805 from nextcloud/fix-public-links-stable12

[stable12] fix preview for public links

7 years agoShow warning if PHP 7.2 is used 5792/head
Lukas Reschke [Wed, 19 Jul 2017 15:11:32 +0000 (17:11 +0200)]
Show warning if PHP 7.2 is used

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>