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

17123 commits

Author SHA1 Message Date
Julius Härtl
a9c089064b
Deprecate TemplateManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-16 09:54:17 +02:00
Daniel Kesselberg
0ecc70c497
Assume that getType is available 
From PHP7 getType is always available. No need to check it nowdays.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-14 09:50:12 +02:00
Daniel Kesselberg
ace74ef866
Fix ReflectionType::__toString() is deprecated 
As of PHP 7.1.0, ReflectionType::__toString() is deprecated, and ReflectionParameter::getType() may return an instance of ReflectionNamedType. To get the name of the parameter type, ReflectionNamedType() is available in this case.

https://www.php.net/manual/en/reflectionparameter.gettype.php
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-14 09:50:06 +02:00
Nextcloud bot
c6b9f073ed
[tx-robot] updated from transifex 2019-10-14 02:15:09 +00:00
Nextcloud bot
7f8ff16c76
[tx-robot] updated from transifex 2019-10-12 02:15:10 +00:00
Roeland Jago Douma
1e8f063aed
Merge pull request #17484 from nextcloud/bugfix/activity-last-timestamp-merged 
Always use the latest timestamp for merged activities
 2019-10-10 20:30:16 +02:00
Roeland Jago Douma
5917644536
Merge pull request #17276 from nextcloud/storage-id-eq 
Get single storage id using `eq` instead of `in`
 2019-10-09 15:17:49 +02:00
Julius Härtl
a41ed39bf2
Always use the latest timestamp for merged activities 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-09 11:25:37 +02:00
Roeland Jago Douma
5122629bb0
Make renewSessionToken return the new token 
Avoids directly getting the token again. We just inserted it so it and
have all the info. So that query is just a waste.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-09 10:10:37 +02:00
Roeland Jago Douma
3fccc7dc47
Cache the public key tokens 
Sometimes (esp with token auth) we query the same token multiple times.
While this is properly indexed and fast it is still a bit of a waste.

Right now it is doing very stupid caching. Which gets invalidate on any
update.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 13:57:36 +02:00
Roeland Jago Douma
075a0b24d5
Merge pull request #17431 from johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive 
make TrustedDomainHelper case insensitive
 2019-10-08 08:51:11 +02:00
Roeland Jago Douma
f2d44b87bb
Merge pull request #17440 from nextcloud/enh/noid/log-json-escape 
Do not escape slashes in log json
 2019-10-08 08:48:52 +02:00
Daniel Kesselberg
fdf4e1ebb2
Remove duplicate code 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-08 00:46:50 +02:00
Julius Härtl
29a6f2d830
Do not escape slashes in log json 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-07 13:39:40 +02:00
Johannes Koenig
2df8d646c1 make TrustedDomainHelper case insensitive 
Signed-off-by: Johannes Koenig <mail@jokoenig.de>
 2019-10-06 20:43:55 +02:00
Nextcloud bot
e20dbc04ba
[tx-robot] updated from transifex 2019-10-06 02:15:13 +00:00
John Molakvoæ
62399c76e8
Allow group displaynames in the database backend (#17221) 
Allow group displaynames in the database backend
 2019-10-05 18:34:14 +02:00
Roeland Jago Douma
6db51324fa
Fix DB usersInGroups fetching 
* Follow the interface defaults
* Only set limit or offset if they are properly set

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-02 09:43:35 +02:00
blizzz
47ab961aa7
Merge pull request #17001 from nextcloud/fix/noid/addressbookchanges-avatar 
reduce adressbook change events and handling
 2019-10-01 12:17:35 +02:00
Christoph Wurst
de6940352a Move settings to an app 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-09-28 09:39:28 +00:00
Nextcloud bot
8ca587be3a
[tx-robot] updated from transifex 2019-09-28 02:14:51 +00:00
Joas Schilling
b9f963225f
Do not allow to have an empty display name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-27 14:29:57 +02:00
Joas Schilling
00859f46f3
Fix DI issue 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-27 14:29:56 +02:00
Joas Schilling
0bb05bbaf8
Update autoloader 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-27 14:29:56 +02:00
Joas Schilling
a54ff49c6b
Remove inherited docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-27 14:29:56 +02:00
Joas Schilling
653628c8fb
Allow to set the group display name in the database backend 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-27 14:29:56 +02:00
Joas Schilling
45506adc5c
Add a displayname to the database group backend 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-27 14:29:56 +02:00
Roeland Jago Douma
cc6874df19
Merge pull request #17264 from nextcloud/move-from-storage-wrappers 
handle moveFromStorage within the same storage even when storage wrap…
 2019-09-26 15:48:59 +02:00
Robin Appelman
bde791cec9
use eq instead of in for loading single storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-26 15:04:04 +02:00
Robin Appelman
1a8f9b8b1d
log which storage id can't be inserted 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-26 15:04:00 +02:00
Roeland Jago Douma
1cb1b132ca
Merge pull request #17252 from nextcloud/bugfix/noid/user-0-can-not-comment 
Fix user with id 0 to be able to comment
 2019-09-26 11:30:56 +02:00
Roeland Jago Douma
6ac67011f4
Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-delete 
dont delete cache entries if deleting an object from object store failed
 2019-09-26 11:24:02 +02:00
Joas Schilling
472ce5cbce
Merge pull request #17181 from nextcloud/feature/noid/talk-attachment 
Add talk-attachment as a rich object type
 2019-09-26 09:27:03 +02:00
Robin Appelman
35f317df7b
handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage 
the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 19:17:06 +02:00
Robin Appelman
733d4b6cca
dont delete cache entries if deleting an object from object store failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 18:09:45 +02:00
Joas Schilling
e4b36f4f47
Fix user with id 0 to be able to comment 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-25 09:07:07 +02:00
Nextcloud bot
c99fcd63f8
[tx-robot] updated from transifex 2019-09-25 02:14:47 +00:00
Nextcloud bot
61d22ff6cf
[tx-robot] updated from transifex 2019-09-24 02:14:41 +00:00
Roeland Jago Douma
48a00b88e1
Merge pull request #17163 from nextcloud/bugfix/noid/print-error-on-data-dir-error 
Print error on data dir error
 2019-09-23 10:08:58 +02:00
Roeland Jago Douma
b2aec1d816
Merge pull request #17206 from nextcloud/logger-catch-exceptions 
catch exceptions that occur during logging
 2019-09-19 18:33:45 +02:00
Robin Appelman
2943c18548
catch exceptions that occur during logging 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-19 13:39:40 +02:00
Christoph Wurst
a5869be60f Fix l10n in federated file sharing 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-09-19 12:57:45 +02:00
Nextcloud bot
ce10683944
[tx-robot] updated from transifex 2019-09-19 02:15:38 +00:00
Roeland Jago Douma
210a0554a2
Use the actual password to update the tokens 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-18 19:50:58 +02:00
Daniel Kesselberg
ee76b0fbd2
Add uid to delete temp token query 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-18 16:52:42 +02:00
Roeland Jago Douma
3efd9a12d7
Merge pull request #17175 from nextcloud/feature/noid/make-getById-work-for-files-in-appdata 
Fix getById for files in appdata and the root mount
 2019-09-18 13:44:52 +02:00
Joas Schilling
23cf72493a
Add talk-attachment as a rich object type 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-17 15:08:54 +02:00
Nextcloud bot
8cc41974a4
[tx-robot] updated from transifex 2019-09-17 12:33:26 +00:00
Joas Schilling
a4ba2113b2
Fix getById for files in appdata and the root mount 
In case the path we are currently in is inside the appdata_* folder,
the original getById method does not work, because it can only look inside
the user's mount points. But the user has no mount point for the root storage.

So in that case we directly check the mount of the root if it contains
the id. If it does we check if the path is inside the path we are working
in.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-17 11:15:59 +02:00
Joas Schilling
ad7d13a87c
Print the error pages as error so we load less scripts and might be able to view it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-16 19:38:43 +02:00