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

8463 commits

Author SHA1 Message Date
Morris Jobke
7306d30708
Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_at_root 
Actually return the root folder when traversing up the tree
 2018-04-27 13:59:29 +02:00
Roeland Jago Douma
a0e038f912
generateTokenFromCache is only valid for V3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:51:05 +02:00
Roeland Jago Douma
7318882357
json_decode an associative array for the swift cached token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:47:47 +02:00
Roeland Jago Douma
235e3480e6
Actually return the root folder when traversing up the tree 
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:04:19 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Morris Jobke
b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced 
Add option for header logo and favicon in theming app
 2018-04-25 08:47:14 +02:00
Roeland Jago Douma
81f71cb1f9
Numeric only uids are no fun 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 14:23:50 +02:00
Roeland Jago Douma
074a0e0665
Cast retrieved DB fields to string 
Fixes #9279

If a pure numerical user is in the DB the value might be casted to a int
when returned. Cast it all to a string so we don't break the strict
typing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 12:48:52 +02:00
Roeland Jago Douma
1ceb081c9b
Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 
Swift v3 requires setting a scope
 2018-04-24 09:49:27 +02:00
Roeland Jago Douma
ba71918ad2
Swift v3 requires setting a scope 
Unscoped auth is not guaranteed to return a catalog. So require the
scope to be set properly.

See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 19:34:09 +02:00
Daniel Calviño Sánchez
9b150001ff
Merge pull request #9272 from nextcloud/bugfix/noid/save-a-query-help-saving-the-world 
Only query last comment info, when there is one
 2018-04-23 16:43:09 +02:00
Joas Schilling
05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable 
Fix undefined variable - found by Phan
 2018-04-23 15:51:15 +02:00
Roeland Jago Douma
961b27eeb0
Convert group Database backend 
This now uses the new interfaces

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 14:39:30 +02:00
Morris Jobke
4fd697e733
Remove a check for an unused variable 
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:53:48 +02:00
Joas Schilling
446efa4625
Only query last comment info, when there is one 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-23 11:50:30 +02:00
Morris Jobke
431ccb6386
Fix undefined variable - found by phan 
Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:34:41 +02:00
Morris Jobke
67dcff7a1f
Fix undefined variable - found by Phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:30:22 +02:00
Roeland Jago Douma
0ed6f9c2da
Merge pull request #9129 from nextcloud/feature/noid/proper-comments-offset 
Add proper comment offset support
 2018-04-22 20:47:30 +02:00
Roeland Jago Douma
9f4e928c0f
Merge pull request #9225 from nextcloud/bugfix/9157/ipv6-database-host 
Allow IPv6 database hosts
 2018-04-22 20:43:29 +02:00
Julius Härtl
272b392cac
Move to more generic image handling and add extra images 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Joas Schilling
5157349b69
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 17:10:03 +02:00
Joas Schilling
78ee3abb78
Move regex to a function and add tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 12:49:36 +02:00
Roeland Jago Douma
a0028a2a5f
Allow to skip retrieving from cache in the DiscoveryService 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-18 19:18:34 +02:00
Joas Schilling
8f7a0af951
Allow IPv6 database hosts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 14:48:21 +02:00
Joas Schilling
f50abde7ac
Add proper comment offset support 
The offset is based on the last known comment instead of limit-offset,
so new comments don't mess up requests which get the history of an object-

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 14:23:15 +02:00
Robin Appelman
f399e1591f
Log classnames of arguments in exception trace 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-17 13:46:36 +02:00
Robin Appelman
46d0d0cda1
fix appinfo parsing when a single localized option is provided 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-17 11:14:03 +02:00
Morris Jobke
9ee1febf62
Provide an option to disable HTML emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-16 19:00:05 +02:00
Morris Jobke
4d832cd4e3
Fixes false positive possible sql injection by phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-16 11:47:11 +02:00
Morris Jobke
1517b1452e
Fix autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-12 16:24:44 +02:00
Jan-Christoph Borchardt
04f47a7653
Merge pull request #8535 from nextcloud/new-color-generator 
New color generator algorithm
 2018-04-12 14:37:53 +02:00
Robin Appelman
89a9d35d90 dont keep shared database locks when running cli scripts 
For cli scripts we don't have the assumption that the universe will be cleaned up soon

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-11 19:21:45 +02:00
Morris Jobke
88c1b8edbd
Merge pull request #9024 from nextcloud/fix/app-fetcher-major-minor-versions 
Fix version comparison with minor and patch level requirements
 2018-04-11 15:48:23 +02:00
Robin Appelman
96f14a2e90 log previous exception 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-11 14:35:08 +02:00
Morris Jobke
7a3ce073da
Merge pull request #8946 from nextcloud/log-exceptions-as-nested-array-2 
Log exceptions as nested array instead of encoded json
 2018-04-11 14:24:47 +02:00
Robin Appelman
15815c034f adjust tests to new exception log format 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-11 11:46:36 +02:00
Morris Jobke
185a260f6b
Merge pull request #9074 from nextcloud/ARGON2I 
Add ARGON2I support to the hasher
 2018-04-11 11:04:42 +02:00
Morris Jobke
3d80ade8d7
Log possible exception caused by wrong version number 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-11 10:08:23 +02:00
Christoph Wurst
ac939e8fd4
Fix version comparison with minor and patch level requirements 
If an app requires a specific minor or path level server version,
the version_compare prevented the installation as only the major
version had been compared and that checks obviously returns `false`.

Now the full version is used for comparison, making it possible to
release apps for a specific minor or patch level version of Nextcloud.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-04-11 10:08:23 +02:00
Morris Jobke
e302266a6a
Merge pull request #9137 from nextcloud/default-log-rotate-size 
Set the default log rotate size to 100 MB
 2018-04-11 02:10:54 +02:00
Morris Jobke
38961a725f
Merge pull request #8833 from nextcloud/feature/noid/add_ldap_user_hooks 
add anounce- and (pre/|post)RevokeUser signals for non-native backends
 2018-04-11 00:44:39 +02:00
Morris Jobke
058f8123e6
Set the default log rotate size to 100 MB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-11 00:27:51 +02:00
Robin Appelman
b9583c6dce Log exceptions as nested array instead of encoded json 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-10 15:53:43 +02:00
Christoph Wurst
6248b61193 Fix AppFetcher::setVersion phpdoc 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-04-10 12:32:56 +02:00
Morris Jobke
acbcc607ea
Merge pull request #9111 from nextcloud/use-proper-bool-user-disabled-state 
Return proper boolean and do not save enabled state in db
 2018-04-09 23:39:02 +02:00
John Molakvoæ (skjnldsv)
eae55761de
Properly return boolean on enable state 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-09 11:26:26 +02:00
John Molakvoæ (skjnldsv)
d5cfd09d47
fixup! Updated php generator 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-06 21:32:45 +02:00
John Molakvoæ (skjnldsv)
57a1dc1231
Updated php generator 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-06 21:32:44 +02:00
Daniel Calviño Sánchez
90fdf83ca7
Use zip32 only if there are less than 65536 files 
A zip32 file can contain, at most, 65535 files (and folders), so take
that constraint into account.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-04-06 15:59:30 +02:00
Roeland Jago Douma
4a73f645e5
Use zip32 if possible 
* OSX doesn't handle 64zip that well
* Some other implentations don't handle it perfectly either
* If the file is belog 4GiB (some overhead) => zip32
* This covers the 99% case I bet

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-06 15:59:30 +02:00