36c9b12fd8
Merge pull request #8689 from nextcloud/12-7449
...
[stable12] Fix 500 on setup page
2018-03-06 18:00:40 +01:00
a0d2d0c272
Add missing import
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-06 17:20:11 +01:00
6acc307aa3
Merge pull request #8679 from nextcloud/7707_12
...
[stable12] generate different UIDs for Birthday, Anniversary and Death event
2018-03-06 13:38:10 +01:00
95f067a613
Merge pull request #8682 from nextcloud/8474_12
...
[stable12] Log exceptions that happen when writing the app store reply to storage
2018-03-06 13:36:38 +01:00
51b79a5df4
Fix 500 on setup page
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-06 13:28:31 +01:00
3d1730537a
Merge pull request #8681 from nextcloud/8391_12
...
[stable12] Don't use double quotes in MySQL queries
2018-03-06 13:19:18 +01:00
bcd01da517
Merge pull request #8677 from nextcloud/8297_12
...
[stable12] Fix example regex for user agent matching
2018-03-06 12:14:56 +01:00
72dc7520a4
Merge pull request #8674 from nextcloud/stable12-8634
...
[stable12] do not create empty userid when attribute does not have allowed chars
2018-03-06 12:03:27 +01:00
22b98ddd41
Log exceptions that happen when writing the app store reply to storage
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:28:40 +01:00
e359640899
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:37 +01:00
8b28e91dcb
generate different UIDs for Birthday, Anniversary and Death event
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-03-06 11:21:16 +01:00
23f37cd741
Fix example regex for user agent matching
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:18:22 +01:00
ac8d572102
[tx-robot] updated from transifex
2018-03-06 01:13:03 +00:00
763a7c114f
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:20:09 +01:00
66cba3e01b
Merge pull request #8611 from nextcloud/css-file-suffix-with-apps-versions-backport
...
[stable12] Use apps versions to generate suffix when possible
2018-03-05 15:05:14 +01:00
2dc82d49e3
Merge pull request #8655 from nextcloud/stable12-8630
...
[stable12] use hash algo that's robust against collisions
2018-03-05 15:02:02 +01:00
9db6c7d9c2
use hash algo that's robust against collisions
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 13:22:41 +01:00
af8d300bd2
Merge pull request #8632 from nextcloud/stable12-8372
...
[12] Properly encapsulate require_once for app.php
2018-03-05 12:35:38 +01:00
d2283aaf17
[tx-robot] updated from transifex
2018-03-05 01:12:58 +00:00
665e8fa6fa
[tx-robot] updated from transifex
2018-03-04 01:13:33 +00:00
18beec8ad8
[tx-robot] updated from transifex
2018-03-03 01:13:05 +00:00
251b21bb74
Add throws annotation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:17:44 +01:00
4bd0a3fe4d
Properly encapsulate require_once for app.php
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:17:44 +01:00
c2db0f9d04
Merge pull request #8622 from nextcloud/12-8612
...
[stable12] Update commentstabview.js
2018-03-02 11:24:07 +01:00
829589b6ea
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:45:10 +01:00
b031ead04b
Merge pull request #8616 from nextcloud/stable12-8355
...
[stable12] Fix comments (and systemtags) when involving users with numerical ids
2018-03-02 10:35:18 +01:00
e225f9548b
[tx-robot] updated from transifex
2018-03-02 01:13:08 +00:00
586e4c1340
backport of #8355 to stable12
...
test creating comments with numeric user ids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix creating comments when file is accessible to users with numeric ids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
tests for systemtags related to numeric user ids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix systemtags event with numeric user ids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-02 00:32:48 +01:00
a7e7b874e4
Use apps versions to generate suffix when possible
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-01 20:43:12 +01:00
ec18b5ee33
[tx-robot] updated from transifex
2018-03-01 01:13:01 +00:00
22e9568664
[tx-robot] updated from transifex
2018-02-28 01:13:25 +00:00
6f4b6bea1c
Merge pull request #8130 from nextcloud/fix-own-avatar-not-updated-when-display-name-is-changed
...
[stable12] Fix own avatar not updated when display name is changed
2018-02-27 18:40:42 +01:00
7c6b7b40ae
Merge pull request #8549 from kyrofa/backport_12/8462/theming_app_outside_root
...
[stable12] theming: handle not being in the serverroot
2018-02-27 11:59:49 +01:00
710d1bba24
Merge pull request #8544 from nextcloud/allow-oc-upgrading
...
[stable12] Allow upgrading from OC 10.0.6 & 10.0.7
2018-02-27 09:07:20 +01:00
73dd68802a
[tx-robot] updated from transifex
2018-02-27 01:15:16 +00:00
401a2692e8
theming: handle not being in the serverroot
...
Currently, the theming app assumes it's in the serverroot. However, with
Nextcloud's flexibility regarding configurable app paths, this is not a
safe assumption to make. If it happens to be an incorrect assumption,
the theming app fails to work.
Instead of relying on the serverroot, just use the path from the
AppManager and utilize relative paths for assets from there.
Fix #8462
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2018-02-26 10:14:57 -08:00
bf2fb8f23b
Allow upgrading from OC 10.0.6 & 10.0.7
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-26 16:43:33 +01:00
ee010687ea
Merge pull request #8537 from nextcloud/8522-stable12
...
[stable12] Fix retrieval of group members with numerical uids from LDAP
2018-02-26 15:09:54 +01:00
0b51ce66b3
fix retrieving group members with numerical uids from LDAP
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 13:39:48 +01:00
90a70fb4f5
tests for retrieving group members with numerical uids
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 13:38:47 +01:00
1489474ee5
Merge pull request #8533 from nextcloud/8499-stable12
...
[stable12] don't try login with the same name that just failed
2018-02-26 12:28:01 +01:00
cef195fc48
don't try login with the same name that just failed
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 11:01:07 +01:00
4bf292b112
Merge pull request #8520 from nextcloud/stable12-8507
...
Add some whitespace around change.svg icon (stable12)
2018-02-24 16:26:06 +01:00
4ca227577f
Merge pull request #8516 from nextcloud/12-8502
...
[stable12] Show hint in OCS API for user creation
2018-02-24 16:25:17 +01:00
730a68402d
[tx-robot] updated from transifex
2018-02-24 01:13:07 +00:00
2692243460
Add some whitespace around change.svg icon (stable12)
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2018-02-23 11:19:08 +01:00
366ffb74dc
Show hint in OCS API for user creation
...
* adds a 107 error code together with the hint of the exception
* logs the exception as warning
* fixes #7946
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-23 10:25:56 +01:00
8687f809f3
[tx-robot] updated from transifex
2018-02-23 01:13:07 +00:00
260cbfe36f
[tx-robot] updated from transifex
2018-02-22 01:13:16 +00:00
0b21cabf10
Merge pull request #8205 from nextcloud/bugfix/noid/fix-result-size-when-searching-for-sharees
...
[stable12] Better result handling of email search
2018-02-21 15:44:41 +01:00
Morris Jobke
Daniel Calviño Sánchez
Joas Schilling
Robin Müller
Georg Ehrke
Nextcloud bot
Arthur Schiwon
Roeland Jago Douma
Julius Härtl
rakekniven
John Molakvoæ (skjnldsv)
Kyle Fazzari
Marin Treselj