Commit Graph

36853 Commits

Author SHA1 Message Date
Nextcloud bot 1692daec40
[tx-robot] updated from transifex 2017-07-06 00:09:02 +00:00
Morris Jobke bb1ff50f63 Merge pull request #5215 from nextcloud/autocomplete-settings-stable11
[stable11] some sharing settings
2017-07-05 11:22:39 +02:00
Nextcloud bot 9a55dd5867
[tx-robot] updated from transifex 2017-07-05 00:08:45 +00:00
Morris Jobke 1a3df3b701 Merge pull request #5575 from nextcloud/backport-lookup-server-settings
allow to disable upload to lookup server, by default it is enabled
2017-07-04 11:19:14 +02:00
Nextcloud bot a7c1d2c55a
[tx-robot] updated from transifex 2017-07-04 00:08:43 +00:00
Nextcloud bot fbd62b53c4
[tx-robot] updated from transifex 2017-07-03 00:08:40 +00:00
Nextcloud bot b884049064
[tx-robot] updated from transifex 2017-07-02 00:08:32 +00:00
Nextcloud bot d3cbbf0185
[tx-robot] updated from transifex 2017-07-01 00:08:47 +00:00
Bjoern Schiessle 9aa41b229d
simplify return statement
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-30 17:35:44 +02:00
Bjoern Schiessle 18c292d5c3
allow to disable upload to lookup server, by default it is enabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-30 17:29:26 +02:00
Nextcloud bot 0305440263
[tx-robot] updated from transifex 2017-06-30 00:08:45 +00:00
Nextcloud bot 4fc404ca54
[tx-robot] updated from transifex 2017-06-29 00:08:45 +00:00
Nextcloud bot 74407879c4
[tx-robot] updated from transifex 2017-06-28 00:08:36 +00:00
Nextcloud bot 184eedf6d7
[tx-robot] updated from transifex 2017-06-27 00:08:36 +00:00
Nextcloud bot 1be751d23b
[tx-robot] updated from transifex 2017-06-26 00:08:49 +00:00
Nextcloud bot 904fd586e0
[tx-robot] updated from transifex 2017-06-25 00:08:36 +00:00
Nextcloud bot 9d35ab757e
[tx-robot] updated from transifex 2017-06-24 00:08:48 +00:00
Nextcloud bot 8fd41b723a
[tx-robot] updated from transifex 2017-06-23 00:09:33 +00:00
Nextcloud bot 8d6625a211
[tx-robot] updated from transifex 2017-06-22 00:08:55 +00:00
Morris Jobke 56c345b471 Merge pull request #5499 from nextcloud/backport-5459-dont-reload-on-subadmin-setting-change
[stable11] Don't try to save the setting when its not an admin
2017-06-21 15:36:18 -05:00
Morris Jobke 53ff2c30b6 Merge pull request #5493 from Bekcpear/stable11
[stable11] Fix upload remaining time
2017-06-21 12:18:37 -05:00
Joas Schilling 04998df1ea
Also allow group admins to toogle the storage location
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 12:40:57 +02:00
Joas Schilling 274964f3b7
Don't try to save the setting when its not an admin
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 12:40:45 +02:00
Yaojin Qian f56cf517bd
Fix upload remaining time
Backport https://github.com/nextcloud/server/pull/5177

Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-21 09:11:56 +08:00
Nextcloud bot a62530d7c1
[tx-robot] updated from transifex 2017-06-21 00:08:33 +00:00
Nextcloud bot b28705b31c
[tx-robot] updated from transifex 2017-06-20 00:09:00 +00:00
Nextcloud bot d22d3b316f
[tx-robot] updated from transifex 2017-06-19 00:08:38 +00:00
Nextcloud bot f5eaee4f31
[tx-robot] updated from transifex 2017-06-17 00:08:46 +00:00
Nextcloud bot 95c016fc24
[tx-robot] updated from transifex 2017-06-16 00:09:03 +00:00
Morris Jobke 3e9cda35cb Merge pull request #5190 from nextcloud/treat-session-regid-error-stable11
[stable11] Treat PHP Errors on User session regenerate
2017-06-14 23:20:27 -05:00
Nextcloud bot 27710d3fdb
[tx-robot] updated from transifex 2017-06-15 00:09:03 +00:00
Arthur Schiwon 6f1fd9ce08
change PHP errors to ErrorException in the session (PHP >=7)
Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 12:57:07 +02:00
Lukas Reschke c6cd90f18c Merge pull request #5363 from nextcloud/exclude-files-external-dir-from-encryption-stable11
[stable11] don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:14 +02:00
Nextcloud bot b7c6586c8d
[tx-robot] updated from transifex 2017-06-14 00:08:59 +00:00
Morris Jobke f6181d8e16 Merge pull request #4913 from nextcloud/backport-4810-mimetype-update
[stable11] Fix mimetype update query
2017-06-13 17:39:31 -05:00
Morris Jobke 136601ccae Merge pull request #5366 from nextcloud/backport-5365
[stable11] filter missing groups in share provider
2017-06-13 08:05:43 -05:00
Robin Appelman 460df4c007
filter missing groups in share provider
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-13 10:55:09 +02:00
Bjoern Schiessle f8addd4cf9
don't try to encrypt/decrypt the certificate bundle
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 10:16:18 +02:00
Nextcloud bot b01c39478a
[tx-robot] updated from transifex 2017-06-13 00:08:42 +00:00
Nextcloud bot d93db515b4
[tx-robot] updated from transifex 2017-06-12 00:08:30 +00:00
Nextcloud bot 735e46d79b
[tx-robot] updated from transifex 2017-06-11 00:08:39 +00:00
Nextcloud bot e8b1e30fbd
[tx-robot] updated from transifex 2017-06-10 00:08:56 +00:00
Nextcloud bot 5f1ee2e2f1
[tx-robot] updated from transifex 2017-06-09 00:08:44 +00:00
Nextcloud bot b620eb192a
[tx-robot] updated from transifex 2017-06-08 00:08:46 +00:00
Nextcloud bot 99180cc30a
[tx-robot] updated from transifex 2017-06-07 00:09:25 +00:00
Nextcloud bot 4f2246a92d
[tx-robot] updated from transifex 2017-06-06 00:09:04 +00:00
Nextcloud bot 7a850244ec
[tx-robot] updated from transifex 2017-06-05 00:08:47 +00:00
Nextcloud bot 480e7d0613
[tx-robot] updated from transifex 2017-06-04 00:08:49 +00:00
Nextcloud bot 19adcc8945
[tx-robot] updated from transifex 2017-06-03 00:09:21 +00:00
blizzz 671a779a17 Merge pull request #5214 from nextcloud/5213-stable11
[stable11] Trigger changeUser hook only on real changes
2017-06-02 13:15:29 +02:00