wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
46958 commits 157 branches 562 tags 714 MiB
Commit graph

16246 commits

Author SHA1 Message Date
Nextcloud bot
d664a9b37b
[tx-robot] updated from transifex 2018-11-23 01:12:51 +00:00
Joas Schilling
b8fcf6e9b3
Allow empty strings in getAbsoluteURL 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:16 +01:00
Morris Jobke
53418f2795
Merge pull request #12543 from nextcloud/fix/12498/bearer_tokens_are_apptokens 
Bearer tokens are app token
 2018-11-20 11:49:33 +01:00
Morris Jobke
cc6c30e769
Merge pull request #12494 from nextcloud/cache-notfound-id 
return the correct value when trying to get a non existing item from cache by id
 2018-11-20 09:51:18 +01:00
Morris Jobke
8e65f08617
Merge pull request #12500 from nextcloud/swift-object-not-found 
forward object not found error in swift as dav 404
 2018-11-20 09:49:57 +01:00
Roeland Jago Douma
c2beb36bfc
Bearer tokens are app token 
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>
 2018-11-20 09:23:57 +01:00
Morris Jobke
cef8eadf2a
Add PHPDoc for thrown exception 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-19 15:34:07 +01:00
Robin Appelman
35251928d5
forward object not found error in switch as dav 404 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-19 11:34:38 +01:00
Julius Härtl
b9f2ce2796
Fix loading of .woff2 files in .htaccess 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-18 11:02:20 +01:00
Robin Appelman
5d5cfefd35
return the correct value when trying to get a non existing item from cache by id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-16 17:26:42 +01:00
Nextcloud bot
def8af3e7e
[tx-robot] updated from transifex 2018-11-16 01:12:14 +00:00
Christoph Wurst
1b85ef4bf2
Fix string doc type casing 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-11-15 11:57:05 +01:00
Morris Jobke
d70b010432
Merge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again 
Shorten index name of calendar changes table
 2018-11-15 10:47:51 +01:00
Nextcloud bot
10c9b37461
[tx-robot] updated from transifex 2018-11-15 01:12:14 +00:00
Roeland Jago Douma
1783fa7176
Merge pull request #12455 from nextcloud/twofactor-backup-settings 
Don't register twofactor_backup settings as "regular" settings
 2018-11-14 19:35:13 +01:00
Robin Appelman
2482e8ee34
Log invalid settings class 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-14 18:04:52 +01:00
Roeland Jago Douma
be5c050acc
Throw exception if decryption fails 
For #11868

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-14 12:47:35 +01:00
Joas Schilling
aa88254f64
Shorten index name of calendar changes table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-14 10:14:23 +01:00
Robin Appelman
e1a49a223b
Fix SetVcardDatabaseUID when using postgresql 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-13 14:26:33 +01:00
Nextcloud bot
5e84824839
[tx-robot] updated from transifex 2018-11-13 01:12:40 +00:00
Morris Jobke
0c9e411f76
Merge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-warning-always 
Remove outdated integrity warning on each page
 2018-11-12 22:44:55 +01:00
Morris Jobke
3996210307
Merge pull request #12419 from nextcloud/bugfix/noid/group-creation-replace-insertIfNotExist 
Fix UniqueConstraintViolationException while insert into oc_groups
 2018-11-12 21:14:38 +01:00
Morris Jobke
f6fed4d54b
Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-found 
Ignore icons if the file could not be found
 2018-11-12 21:13:19 +01:00
Morris Jobke
fd8eeccb15
Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function 
Use the defined func()->count() instead of manual counting
 2018-11-12 17:43:56 +01:00
Morris Jobke
84fd81e33f
Fix UniqueConstraintViolationException while insert into oc_groups 
* fixes race condition in insert
* fixes potentiaol deadlock

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 17:36:35 +01:00
Julius Härtl
4acd053e4d
Do not fail if the icon file doesn't exists 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-12 17:31:54 +01:00
Morris Jobke
9e1ec0cf46
Merge pull request #12413 from nextcloud/bugfix/9305/oc_file_locks-unique-constraint 
Fix UniqueConstraintViolationException while insert into oc_file_locks
 2018-11-12 17:27:09 +01:00
Morris Jobke
761ba1801b
Remove outdated integrity warning on each page 
* integrity warning is shown during update and in the admin setup checks
* there is also the plan to retire this old way of notification

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 16:54:38 +01:00
Morris Jobke
f7e3cf2085
Fix UniqueConstraintViolationException while insert into oc_file_locks 
* 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>
 2018-11-12 15:13:10 +01:00
Morris Jobke
93c62d78db
Fix UniqueConstraintViolationException while insert into oc_filecache 
* 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>
 2018-11-12 14:43:28 +01:00
Morris Jobke
859dd1e742
Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist 
Catch UniqueConstraintViolationException inside insertIfNotExist
 2018-11-12 13:41:00 +01:00
Julius Härtl
26b160cc43
Make sure to always load the latest icons-vars.css file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-12 11:00:56 +01:00
Nextcloud bot
48395baa7e
[tx-robot] updated from transifex 2018-11-12 01:12:49 +00:00
Nextcloud bot
6dc2b03ebe
[tx-robot] updated from transifex 2018-11-11 01:13:10 +00:00
Morris Jobke
5273639d0e
Add deprecation message ofr insertIfNotExist 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-09 12:13:30 +01:00
Morris Jobke
230e93f575
Catch UniqueConstraintViolationException inside insertIfNotExist 
This is the most common case for the usage of this method.

See also https://github.com/nextcloud/server/issues/12369 and the linked tickets.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-09 10:38:20 +01:00
Joas Schilling
bb352fb667
Use the defined func()->count() instead of manual counting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 15:44:45 +01:00
blizzz
42121fe4d7
Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames 
do not offer to change display name or password, if not possible.
 2018-11-08 15:13:24 +01:00
Morris Jobke
78fd8ab0fd
Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated 
Basic CSP no longer deprecated
 2018-11-08 11:14:41 +01:00
Roeland Jago Douma
58345e02d2
Basic CSP no longer deprecated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-08 10:37:48 +01:00
Roeland Jago Douma
25fe324f41
Merge pull request #12313 from nextcloud/generated-avatar-major-cleanup 
Clear avatar cache with frontend repair
 2018-11-08 10:28:09 +01:00
John Molakvoæ (skjnldsv)
a9eef37456
Clear avatar cache with frontend repair 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-08 08:31:21 +01:00
Arthur Schiwon
505722cc0d
do not offer to change display name or password, if not possible. 
Fixes #12319

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-11-07 22:37:41 +01:00
Joas Schilling
10ba0bed8a
Match mentions when the username is wrapped in quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-07 12:33:44 +01:00
Morris Jobke
add35c7f31
Merge pull request #12284 from nextcloud/fix/1020/search_shared_external 
Properly search the root of a shared external storage
 2018-11-06 18:16:12 +01:00
Nextcloud bot
54a30a4b81
[tx-robot] updated from transifex 2018-11-06 01:12:39 +00:00
Morris Jobke
411d2dece5
Merge pull request #11786 from nextcloud/feature/password_confirmation_backend 
Expose password confirmation capabilities in the user backend
 2018-11-06 00:44:18 +01:00
Roeland Jago Douma
0277cd7158
Properly search the root of a shared external storage 
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>
 2018-11-05 16:27:43 +01:00
Morris Jobke
cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer 
Cleanup the DIContainer
 2018-11-05 12:16:36 +01:00
Nextcloud bot
c28ea52155
[tx-robot] updated from transifex 2018-11-05 01:12:32 +00:00