upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-21 14:40:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
42279 commits 996 branches 1224 tags 6.8 GiB
Commit graph

14904 commits

Author SHA1 Message Date
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
Morris Jobke
4fa0cac17c
Merge pull request #8725 from nextcloud/objectstore-no-part-files-13 
[13]  disable part files for object stores
 2018-03-09 10:34:33 +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
Nextcloud bot
b593fd1406
[tx-robot] updated from transifex 2018-03-09 01:12:37 +00: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
Nextcloud bot
d3d0d9e11d
[tx-robot] updated from transifex 2018-03-06 01:12:41 +00: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
Joas Schilling
479b9465c0
Merge pull request #8631 from nextcloud/stable13-8372 
[13] Properly encapsulate require_once for app.php
 2018-03-05 12:35:50 +01:00
Nextcloud bot
d74bad2dc1
[tx-robot] updated from transifex 2018-03-05 01:12:36 +00:00
Nextcloud bot
7717dbbe30
[tx-robot] updated from transifex 2018-03-04 01:13:07 +00:00
Roeland Jago Douma
9413f97b92
Hardening of SimpleFile getContent 
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-02 21:23:41 +01:00
Julius Härtl
9f7e05e737
Add throws annotation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-02 17:16:36 +01:00
Julius Härtl
a61608e8c7
Properly encapsulate require_once for app.php 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-02 17:16:36 +01:00
Nextcloud bot
369b3b28c7
[tx-robot] updated from transifex 2018-03-02 01:12:43 +00:00
Nextcloud bot
03f127f162
[tx-robot] updated from transifex 2018-03-01 01:12:37 +00:00
Roeland Jago Douma
2c6f3c88cf
Merge pull request #8099 from nextcloud/7873_13 
[stable13] Don't perform CSRF check on OCS routes with Bearer auth
 2018-02-28 14:34:20 +01:00
Nextcloud bot
d33a93c6f9
[tx-robot] updated from transifex 2018-02-28 01:12:57 +00:00
Nextcloud bot
4c52fed779
[tx-robot] updated from transifex 2018-02-27 01:14:50 +00:00
Nextcloud bot
a5b73fe761
[tx-robot] updated from transifex 2018-02-23 01:12:43 +00:00
Roeland Jago Douma
27aa0761bc
Merge pull request #8470 from nextcloud/13-8468 
[stable13] Use mb_* string methods to extract first character for generated avatars
 2018-02-21 13:29:28 +01:00
Morris Jobke
f1568b96ce
Use mb_* string methods to extract first character for generated avatars 
This fixes #8451 where the first character is a non-ASCII character. The `$string[0]` notation only extracted one byte and thus resulting in an invalid code. The `mb_strtoupper` method also allows to convert characters independently from the current locale on the server.

See also http://php.net/manual/en/function.mb-strtoupper.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-21 12:40:16 +01:00
Nextcloud bot
86be2687fb
[tx-robot] updated from transifex 2018-02-21 01:12:33 +00:00
Joas Schilling
d63caf5829
Better result handling of email search 
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-20 17:47:54 +01:00
Roeland Jago Douma
a3de507b76
Merge pull request #8440 from nextcloud/8428_13 
[stable13] Use TTF fonts for avatar generation
 2018-02-20 08:21:04 +01:00
Nextcloud bot
16a4e7192c
[tx-robot] updated from transifex 2018-02-20 01:12:21 +00:00
Roeland Jago Douma
a4159378be
Avatar generation use ttf (for ancient compatibility) 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-19 22:12:56 +01:00
Nextcloud bot
b5029f8975
[tx-robot] updated from transifex 2018-02-19 01:12:17 +00:00
Nextcloud bot
b631cc1286
[tx-robot] updated from transifex 2018-02-17 01:12:30 +00:00
Nextcloud bot
ef367f8bfe
[tx-robot] updated from transifex 2018-02-14 21:37:55 +00:00
Nextcloud bot
adb9ad29fa
[tx-robot] updated from transifex 2018-02-14 01:12:17 +00:00
Nextcloud bot
2e271313c9
[tx-robot] updated from transifex 2018-02-12 21:34:01 +00:00
Julius Härtl
1b3e3dfada
Load guest css on any guest and error page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-09 17:46:48 +01:00
Nextcloud bot
9c9c438c8b
[tx-robot] updated from transifex 2018-02-09 15:29:20 +00:00
Morris Jobke
197c97e242
Merge pull request #8102 from nextcloud/s3-uploader-13 
[13] Use S3Client::upload instead of splitting single/multipart upload ourselves
 2018-02-08 14:31:23 +01:00