upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
42466 commits 951 branches 1208 tags 8.3 GiB
Commit graph

8094 commits

Author SHA1 Message Date
Morris Jobke
003cc5acfd
Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-host 
[stable13] Allow IPv6 database host
 2018-05-14 13:36:21 +02:00
Roeland Jago Douma
a7948069c5
Get correct version of an app 
Related to #8929

We should get the version of the app. Not of the appfolder. Else there
is no way to properly compare the versions.

Now note that installing in 1 go will still fail. But at least on the
next page load the new version will be properly detected.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-09 12:15:39 +02:00
Joas Schilling
ea834dab28
php 5.6 compatibility 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-05-09 12:12:13 +02:00
Joas Schilling
7bb44214a1
Move regex to a function and add tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-05-09 10:50:56 +02:00
Joas Schilling
02388a3942
Allow IPv6 database hosts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-05-09 10:50:47 +02:00
Morris Jobke
7bf713edaf
Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13 
[13] Log lock state on conflict
 2018-05-07 16:29:42 +02:00
Robin Appelman
a6ea5eb1b5
remove unneeded locks in getCacheEntry 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 15:06:39 +02:00
Robin Appelman
bc1a17a9e2
always log locking errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 13:35:26 +02:00
Robin Appelman
a070c1177a
Log more info about locking conflicts for memcache locking backends 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 13:35:26 +02:00
Roland Tapken
cc54429646 Issue #9318: catch exceptions in SCSSCacher::resetCache() 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-05-03 11:02:53 +02:00
Morris Jobke
26c153667a
Merge pull request #9231 from nextcloud/13-9205 
[stable13] Provide an option to disable HTML emails
 2018-04-18 22:38:33 +02:00
Roeland Jago Douma
a1c4bdfdf8
Merge pull request #9233 from nextcloud/13-9159 
[stable13] fix appinfo parsing when a single localized option is provided
 2018-04-18 21:18:37 +02:00
Robin Appelman
5fbba7854b
fix appinfo parsing when a single localized option is provided 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-18 17:32:19 +02:00
Morris Jobke
01278056a5
Provide an option to disable HTML emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-18 16:59:34 +02:00
Joas Schilling
6b97429ebe
Show EOL warning in the update section 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 13:46:25 +02:00
John Molakvoæ
d45a889fe2
Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names 
[stable13] Show group display names
 2018-04-06 15:14:12 +02:00
Morris Jobke
b9ca121671
Merge pull request #9095 from JaredBoone/bugfix/8387 
Do not convert email addresses with idn_to_ascii if…
 2018-04-06 11:44:51 +02:00
Jared Boone
52c7f17faf Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined. 
Fixes https://github.com/nextcloud/server/issues/8387.

Signed-off-by: Jared Boone <jared.boone@gmail.com>
 2018-04-05 11:28:31 -07:00
Morris Jobke
bb656750f5
Add more logging for the object storage during creation of the buckets 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-05 17:29:44 +02:00
Bjoern Schiessle
bd0672530b
Move on with the next user if we found the user on one user back-end 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-04 17:13:47 +02:00
Roeland Jago Douma
5a74b9cb99
Fix proper permissions for multiple file access 
Fixes #8890

In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write

Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:02:37 +02:00
Bjoern Schiessle
d4f64b94f2
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-03 18:12:16 +02:00
John Molakvoæ (skjnldsv)
05f76b3469
Use app version to generate scss filename 
Fixed scsscacher tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-28 16:11:10 +02:00
Arthur Schiwon
e2e27004ff
the FN is optional, carrying the displayname if present 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-03-20 14:35:46 +01:00
Joas Schilling
63089821a4
Correctly return the group name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-12 12:01:19 +01:00
Joas Schilling
97dbaa26c4
Show the displayname in the users group list 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-12 12:00:54 +01:00
Morris Jobke
b0f0c26fe3
Merge pull request #8745 from nextcloud/stable13-8716 
[13] Remove base url from global cache prefix
 2018-03-09 16:15:48 +01:00
Morris Jobke
6176296c80
Merge pull request #8749 from nextcloud/backport/8596/sharee-email-matches-not-limited 
[stable13] Sharee email matches not limited
 2018-03-09 11:29:15 +01:00
Julius Härtl
e2728aaf38
Merge pull request #8746 from nextcloud/8705_13 
[stable13] Check if the cached js file exists
 2018-03-09 10:37:15 +01:00
Joas Schilling
a2f3f0a681
Fix calculation if there are more results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-09 10:16:42 +01:00
Joas Schilling
932fcc9859
Add the users result only when non empty so tests stay the same 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-09 10:15:25 +01:00
Joas Schilling
5b6590f1e9
Also array_slice wide email matches of local users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-09 10:15:04 +01:00
Roeland Jago Douma
2d7d8ca125
Check if the cached js file exists 
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 09:44:32 +01:00
Julius Härtl
b14e4ec6a6
Actually clear cache values for all base urls 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-09 09:24:07 +01:00
Julius Härtl
a098b57817
Use JSCombiner from server container when searching for JS files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-09 09:24:07 +01:00
Julius Härtl
c4539c34c9
Move base url from global cache prefix to frontend related ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-09 09:24:06 +01:00
Robin Appelman
a95ccf4248
disable part files for object stores 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-08 13:09:02 +01:00
michaelletzgus
7e651ffd54
Fix undefined index problem 
Nextcloud 13RC4, error in logfile, triggered by "occ config:list":

Invalid argument supplied for foreach() at lib/private/AppConfig.php#297
PHP	Undefined index: workflowengine at lib/private/AppConfig.php#297

Fix: Check if index exists in array before using it.
 2018-03-06 18:37:52 +01:00
Roeland Jago Douma
a637e0d686
Merge pull request #8687 from nextcloud/backport/8328/filter-out-the-current-user-by-email-too 
[stable13] Filter out the current user when searching for emails too
 2018-03-06 17:11:49 +01:00
Roeland Jago Douma
56d5eb17fe
Merge pull request #8688 from nextcloud/13-8557 
[stable13] Fix check if theming defaults instance is available
 2018-03-06 17:11:37 +01:00
Joas Schilling
173388dcd4
PHP 5.6 compatibility 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-06 14:05:14 +01:00
Morris Jobke
47fa0988d9
Merge pull request #8683 from nextcloud/8474_13 
[stable13] Log exceptions that happen when writing the app store reply to storage
 2018-03-06 13:39:49 +01:00
Morris Jobke
eefbcb32ed
Fix check if theming defaults instance is available 
The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error.

Fixes #8420

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-06 13:24:18 +01:00
Joas Schilling
18968e84fc
Filter out the current user when searching for emails too 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-06 12:20:24 +01:00
Joas Schilling
de1f223961
Log exceptions that happen when writing the app store reply to storage 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-06 11:29:05 +01:00
Robin Müller
619ee56835
Don't use double quotes in MySQL queries 
MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier
quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes).
So for such databases the 'occ upgrade' fails with an error message like this:
... unknown column 'oc_*' in where clause.

This fix replaces the doulbe quotes with single quotes that should be always
used in MySQL queries to quote literal strings.

Signed-off-by: Robin Müller <robin.mueller@1und1.de>
 2018-03-06 11:25:07 +01:00
Roeland Jago Douma
ff7237a098
Merge pull request #8668 from nextcloud/8217_13 
[stable13] Use proper lanugage in langauge code
 2018-03-06 09:47:20 +01:00
Roeland Jago Douma
19ded76b77
Display the proper language strings in setttings 
Since this was moved to lib, we have to the lib language files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 19:48:16 +01:00
Roeland Jago Douma
34671d6ad4
Use proper lanugage in langauge code 
Fixes #8180

The _ is not valid in language codes use - instead.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 19:44:54 +01:00
Joas Schilling
6104a7043e
Merge pull request #8636 from nextcloud/8289_13 
[stable13] AppData hardening
 2018-03-05 12:38:43 +01:00