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
173388dcd4
PHP 5.6 compatibility
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 14:05:14 +01:00
1bdf4f55cb
Merge pull request #8685 from nextcloud/backport/8664/add-missing-settings-page-title-again
...
[stable13] Set the correct active navigation entry
2018-03-06 13:57:25 +01:00
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
ed8e4cc785
Merge pull request #8667 from nextcloud/8158_13
...
[stable13] Use a more widely available method to test s3 settings
2018-03-06 13:38:23 +01:00
16fa18ab49
Merge pull request #8678 from nextcloud/7707_13
...
[stable13] generate different UIDs for Birthday, Anniversary and Death event
2018-03-06 13:37:21 +01:00
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
5f8c773b27
Merge pull request #8680 from nextcloud/8391_13
...
[stable13] Don't use double quotes in MySQL queries
2018-03-06 13:18:59 +01:00
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
d16aa27516
Fix unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:12 +01:00
8f8d7cf9d3
Catch exception when the parent is deleted as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:04 +01:00
5d8aaf9696
Do a recursion instead of an endless loop
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:57 +01:00
7c15b99a49
Fix problem with deleted files
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:51 +01:00
f1e01dbbbc
Fix path handling for activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:45 +01:00
737af44b63
Add special handling for e2e encryption
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:36 +01:00
0911f3bde1
Extract duplicated logic into a method
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:13 +01:00
e11dab4047
Set the correct active navigation entry
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:05:19 +01:00
242f0c0b5a
Merge pull request #8676 from nextcloud/8297_13
...
[stable13] Fix example regex for user agent matching
2018-03-06 11:54:27 +01:00
0667a32c83
Merge pull request #8673 from nextcloud/stable13-8634
...
[stable13] do not create empty userid when attribute does not have allowed chars
2018-03-06 11:30:48 +01:00
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
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
6171940717
generate different UIDs for Birthday, Anniversary and Death event
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-03-06 11:20:53 +01:00
02af9b2f6f
Fix example regex for user agent matching
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:16:41 +01:00
ff7237a098
Merge pull request #8668 from nextcloud/8217_13
...
[stable13] Use proper lanugage in langauge code
2018-03-06 09:47:20 +01:00
f4aae102f7
Merge pull request #8675 from nextcloud/stable13-8601
...
[13] Remove too restrict check for background image/color
2018-03-06 09:46:52 +01:00
80842e1611
Remove to restrict check for background image/color
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-06 09:08:49 +01:00
d3d0d9e11d
[tx-robot] updated from transifex
2018-03-06 01:12:41 +00:00
0045e823fe
Merge pull request #8669 from nextcloud/8218_13
...
[stable13] Display the proper language strings in setttings
2018-03-05 23:46:26 +01:00
6e3c05f513
do not create empty userid when attribute does not have allowed chars
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 23:14:36 +01:00
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
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
3036fb95ae
Use a more widely available method to test s3 settings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-05 19:41:56 +01:00
655e39ffcd
Merge pull request #8610 from nextcloud/stable13-8588-fix-breadcrumbs-width-calculation
...
[stable13] Fix breadcrumbs width calculation
2018-03-05 19:37:53 +01:00
07aba8cdac
Merge pull request #8663 from nextcloud/fix-ie11-datepicker-display-backport
...
[stable13] Fixed date/time picker on IE11
2018-03-05 19:35:25 +01:00
1b0416b1a1
Fixed date/time picker on IE11
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-05 16:40:44 +01:00
9432c59db4
Merge pull request #8654 from nextcloud/stable13-8630
...
[stable13] use hash algo that's robust against collisions
2018-03-05 14:48:49 +01:00
962b046ab5
use hash algo that's robust against collisions
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 13:20:22 +01:00
6104a7043e
Merge pull request #8636 from nextcloud/8289_13
...
[stable13] AppData hardening
2018-03-05 12:38:43 +01:00
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
d74bad2dc1
[tx-robot] updated from transifex
2018-03-05 01:12:36 +00:00
7717dbbe30
[tx-robot] updated from transifex
2018-03-04 01:13:07 +00:00
e23f06561a
[tx-robot] updated from transifex
2018-03-03 01:12:39 +00:00
46bb3fee81
Merge pull request #8609 from nextcloud/ie11-nav-flex-fix
...
[stable13] Fixed app navigation for IE11
2018-03-02 21:27:20 +01:00
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
9f7e05e737
Add throws annotation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:16:36 +01:00
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
364e7fe1be
Merge pull request #8621 from nextcloud/13-8612
...
[stable13] Update commentstabview.js
2018-03-02 11:24:22 +01:00
cbba3e2432
Update commentstabview.js
...
Changed typo reported at GitHub.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-02 10:41:26 +01:00
59d6f45c41
Merge pull request #8615 from nextcloud/stable13-8355
...
[stable13] Fix comments (and systemtags) when involving users with numerical ids
2018-03-02 10:35:40 +01:00
369b3b28c7
[tx-robot] updated from transifex
2018-03-02 01:12:43 +00:00
Roeland Jago Douma
Joas Schilling
Morris Jobke
Robin Müller
Georg Ehrke
Julius Härtl
Nextcloud bot
blizzz
Roeland Jago Douma
Robin Appelman
John Molakvoæ (skjnldsv)
rakekniven