Commit Graph

40294 Commits

Author SHA1 Message Date
Morris Jobke 7e72a26dc7
Merge pull request #8196 from nextcloud/8160_12
[stable 12] Do not try to get the jailed path if we can't find the id
2018-02-06 14:21:11 +01:00
Roeland Jago Douma 10efe528ed
Do not try to get the jailed path if we can't find the id
Fixes #8047

If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-06 12:21:27 +01:00
Nextcloud bot 3df8021406
[tx-robot] updated from transifex 2018-02-06 01:10:45 +00:00
Nextcloud bot 6b4ddfd8b4
[tx-robot] updated from transifex 2018-02-05 01:10:41 +00:00
Nextcloud bot 2a7e629ca5
[tx-robot] updated from transifex 2018-02-04 01:10:51 +00:00
Nextcloud bot b63c93367f
[tx-robot] updated from transifex 2018-02-03 01:10:55 +00:00
Morris Jobke 02fba904f4
Merge pull request #8152 from nextcloud/12-8150
[stable12] Update CRL because user_sql cert was lost
2018-02-02 13:34:47 +01:00
Morris Jobke f2e83c2999
Update CRL because user_sql cert was lost
* see https://github.com/nextcloud/app-certificate-requests/pull/129

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-02 12:01:29 +01:00
Nextcloud bot 26beb5b7f3
[tx-robot] updated from transifex 2018-02-02 01:10:40 +00:00
Nextcloud bot 6fe9d1b57b
[tx-robot] updated from transifex 2018-02-01 18:28:32 +00:00
Nextcloud bot 4620eb8515
[tx-robot] updated from transifex 2018-02-01 17:20:21 +00:00
Nextcloud bot e6fef3b529
[tx-robot] updated from transifex 2018-02-01 01:11:19 +00:00
Nextcloud bot 0809f2ad87
[tx-robot] updated from transifex 2018-01-31 01:11:16 +00:00
Nextcloud bot 2d04a1e1a9
[tx-robot] updated from transifex 2018-01-30 01:11:32 +00:00
Nextcloud bot 9eddb015c1
[tx-robot] updated from transifex 2018-01-29 01:11:18 +00:00
Morris Jobke bae874c9b6
Merge pull request #8074 from nextcloud/stable12-8069
[stable12] do not catch and ignore ServerNotAvailable in the wrong spot
2018-01-27 13:46:17 +01:00
Nextcloud bot 15551aafd1
[tx-robot] updated from transifex 2018-01-27 01:11:17 +00:00
Arthur Schiwon 23ffae497e
do not catch ServerNotAvailable
might cause the user to be unavailable (race condition).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-26 15:38:48 +01:00
Nextcloud bot 355bc845ee
[tx-robot] updated from transifex 2018-01-26 01:11:18 +00:00
Nextcloud bot c3aa2fcacc
[tx-robot] updated from transifex 2018-01-25 01:11:30 +00:00
Morris Jobke 59a8cd3efc
Merge pull request #8022 from nextcloud/fix-jquery-ui-theming
[stable12] Fix jquery-ui theming
2018-01-24 15:41:17 +01:00
Morris Jobke b42d8ca77d
Merge pull request #7797 from nextcloud/stable12-7709-fix-password-displayed-as-username-in-password-manager
[stable12] Fix password displayed as username in Firefox password manager dialog
2018-01-24 15:33:04 +01:00
Morris Jobke f8da92d8fa
Merge pull request #8006 from nextcloud/stable12-7292
[stable12] Fix #4789: Group admins cannot see disabled users
2018-01-24 14:19:33 +01:00
Julius Härtl add38859eb
Fix jquery-ui theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-24 14:03:59 +01:00
Morris Jobke 42633b4d02
Merge pull request #8015 from nextcloud/final-12.0.5
Final 12.0.5
2018-01-24 10:35:25 +01:00
Morris Jobke 4e4f27b9a9
Final 12.0.5
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-24 09:59:05 +01:00
Nextcloud bot ef41c07543
[tx-robot] updated from transifex 2018-01-24 01:11:16 +00:00
Neraste 308891f9bd
Fix #4789: Group admins cannot see disabled users
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-23 16:07:23 +01:00
Robin Appelman 0e30a0dd01
increase the time we wait for smb notifications in the test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-23 09:55:02 +01:00
Nextcloud bot dd03cc577c
[tx-robot] updated from transifex 2018-01-23 01:11:16 +00:00
Morris Jobke 74ee895cc7
Merge pull request #7981 from nextcloud/12.0.5-rc3-prep
12.0.5 RC3
2018-01-22 13:48:41 +01:00
Morris Jobke d095de5710
12.0.5 RC3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-22 11:27:33 +01:00
Nextcloud bot c0806e5445
[tx-robot] updated from transifex 2018-01-22 01:11:06 +00:00
Nextcloud bot ae0641fccc
[tx-robot] updated from transifex 2018-01-21 01:11:18 +00:00
Nextcloud bot ac4b9b745d
[tx-robot] updated from transifex 2018-01-20 01:11:22 +00:00
Roeland Jago Douma e869828562
Merge pull request #7962 from nextcloud/smb-2.0.4-12
[12] update icewind/smb to 2.0.4
2018-01-19 20:23:51 +01:00
Robin Appelman 4803bd1f3f
update icewind/smb to 2.0.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-19 16:30:26 +01:00
Nextcloud bot 8b8c796a31
[tx-robot] updated from transifex 2018-01-19 01:11:20 +00:00
Morris Jobke 533e59f1d5
Merge pull request #7937 from nextcloud/12.0.5-rc2-prep
12.0.5 RC2
2018-01-18 17:31:29 +01:00
Morris Jobke 4b707b5512
12.0.5 RC2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 14:25:26 +01:00
Nextcloud bot 49aa99de7f
[tx-robot] updated from transifex 2018-01-18 01:11:05 +00:00
Nextcloud bot 1e8a1a9400
[tx-robot] updated from transifex 2018-01-17 01:11:24 +00:00
Roeland Jago Douma 60fa75d2ec
Merge pull request #7888 from nextcloud/backport/7879/dont-disable-shipped-apps-on-errors-12
[stable12] Keep all shipped apps enabled because they should be okay
2018-01-16 20:19:32 +01:00
Roeland Jago Douma 7a7e756b0e
Merge pull request #7817 from nextcloud/stable12-7767
[stable12] Fix preview when theming changes invertion of icons
2018-01-16 19:18:56 +01:00
Joas Schilling c7485fa1ad
Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-16 13:41:33 +01:00
Nextcloud bot a3059d0f1f
[tx-robot] updated from transifex 2018-01-16 01:11:18 +00:00
Nextcloud bot cdbf584d37
[tx-robot] updated from transifex 2018-01-15 01:10:56 +00:00
Nextcloud bot 5e1d580010
[tx-robot] updated from transifex 2018-01-14 01:10:56 +00:00
Roeland Jago Douma 392cdd8cad
Merge pull request #7821 from nextcloud/12-7818
[stable12] Log full exception in cron instead of only the message
2018-01-12 22:40:05 +01:00
Morris Jobke b61b357196
Log full exception in cron instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 15:34:16 +01:00