11cb6991f2
Merge pull request #5511 from nextcloud/5491-stable12
...
[stable12] Create users in non default backends first
2017-06-22 14:11:43 +02:00
7257206bcf
Create users in non default backends first
...
Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 13:02:53 +02:00
00256ee18e
[tx-robot] updated from transifex
2017-06-22 00:08:46 +00:00
b150221fd0
Merge pull request #5489 from nextcloud/stable12-5061
...
[stable12] Fix example theme
2017-06-21 16:28:57 -05:00
99d04b1917
[tx-robot] updated from transifex
2017-06-21 00:08:24 +00:00
1552924427
Move styles.css to server.css
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-20 19:29:10 +02:00
6f252aa04a
Merge pull request #5480 from nextcloud/backport-5459-group-admins-change-settings
...
[stable12] Don't try to save the setting when its not an admin
2017-06-20 10:54:09 -05:00
8600ba725a
Also allow group admins to toogle the storage location
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 10:54:05 +02:00
9ae715de75
Don't try to save the setting when its not an admin
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 10:53:26 +02:00
0277400618
[tx-robot] updated from transifex
2017-06-20 00:08:51 +00:00
e76081e858
Revert "dont die if we try to access the shared cache while setting up the shared storage"
...
Revent accidental push
This reverts commit ed89034047
2017-06-19 14:00:27 +02:00
64864bf654
dont die if we try to access the shared cache while setting up the shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-19 13:58:30 +02:00
deaa8b6885
[tx-robot] updated from transifex
2017-06-19 00:08:29 +00:00
c3b58918f1
Merge pull request #5442 from Bekcpear/stable12
...
Fix upload remaining time and uploadrate value
2017-06-17 18:32:47 -05:00
ab837da40b
Merge pull request #5420 from nextcloud/stable12-appmenu-fixes
...
[stable12] App menu fixes
2017-06-17 18:28:59 -05:00
0e608188d2
[tx-robot] updated from transifex
2017-06-17 00:08:36 +00:00
d41d48bd43
Fix upload remaining time and uploadrate value
...
1. The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.
2. The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.
Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-16 22:03:28 +08:00
3cb59ac602
[tx-robot] updated from transifex
2017-06-16 00:08:53 +00:00
3040eaefc7
Merge pull request #5428 from nextcloud/5384-stable12
...
[stable12] Allow to find local users by their email address
2017-06-15 12:53:34 -05:00
cdd4a75c17
Backport of #5384 to stable12
...
Allow to find local users by their email address
Signed-off-by: Joas Schilling <coding@schilljs.com>
Make sure to only add system users once
Signed-off-by: Joas Schilling <coding@schilljs.com>
Add unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-15 19:23:31 +02:00
20d994f21d
Merge pull request #5422 from nextcloud/5190-stable12
...
[stable12] Treat PHP Errors on User session regenerate
2017-06-15 10:20:12 -05:00
c93cad74f9
Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12
...
[stable12] Ldap attempt reconnect stable12
2017-06-15 13:29:42 +02:00
2ffdfeec28
Forward port of #5190 to stable12
...
Treat PHP Errors on User session regenerate
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
remove unnecessary lines…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
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-15 11:18:22 +02:00
02a63e9428
Show at least 8 icons, don't use percentage on mobile
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-15 10:55:17 +02:00
073d5dbc85
Decimal percentage, dynamic appIcon width
...
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:55:11 +02:00
6acabd64ca
Now using dynamic percentual appmenu limit
...
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:55:04 +02:00
d44786e9b7
Closed #5121 , remove appmenu limit
...
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:54:51 +02:00
aeb80e0f57
Merge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_to_groupshares
...
[stable12] allow users to send PropPatch request when calendar is group-shared with them
2017-06-14 23:11:18 -05:00
c20faa1c98
Merge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_special_char_issue
...
[stable12] urldecode group principals in Cal- and CardDAV backend
2017-06-14 23:10:19 -05:00
1965889fc8
[tx-robot] updated from transifex
2017-06-15 00:08:52 +00:00
ec89aaa67a
Merge pull request #5416 from nextcloud/stable12-5392
...
[stable12] Use the guest.css for the maintenance page as well
2017-06-14 18:04:06 -05:00
11d9722474
Merge pull request #5397 from nextcloud/stable12-5072
...
[stable12] Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
2017-06-14 11:30:38 -05:00
b911033e7a
Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12
...
[stable12] Make file name input tooltip error text change
2017-06-14 11:29:03 -05:00
385317a344
Merge pull request #5401 from nextcloud/translate-oauth2
...
Translate OAuth2 in stable12
2017-06-14 11:22:56 -05:00
c603f54a1b
Use the guest.css for the maintenance page as well
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-14 11:10:20 -05:00
ac8d9afcfe
Merge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search-placeholder
...
[stable12] Localize contacts menu search input placeholder
2017-06-14 14:45:15 +02:00
d07a661c94
Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via-email
...
[stable12] Prevent sending second WWW-Authenticate header
2017-06-14 14:24:01 +02:00
aab5dd7d7e
Localize contacts menu search input placeholder
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-06-14 11:52:52 +02:00
50ee4fba11
Translate OAuth2 in stable12
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 11:50:58 +02:00
fbeb6659f8
Merge pull request #5362 from nextcloud/exclude-files-external-dir-from-encryption-stable12
...
[stable12] don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:28 +02:00
426a4c11d6
[tx-robot] updated from transifex
2017-06-14 00:08:49 +00:00
1d2c1cf579
Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar
...
[stable12] allow PropPatch requests to contact_birthdays
2017-06-13 18:11:54 -05:00
513401bdb6
Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071
2017-06-13 18:05:16 -05:00
d4eb5cfecb
Merge pull request #5063 from nextcloud/backport-4969-activity-external-user-avatars
...
[stable12] Fix username and avatar for external users
2017-06-13 17:56:39 -05:00
4fec6dbf87
Merge pull request #5379 from nextcloud/stable12-5310-fix-tag-label-removed-when-share-view-is-opened
...
[stable12] Fix tag label removed when share view is opened
2017-06-13 17:32:55 -05:00
9f265007fe
Merge pull request #5387 from nextcloud/backport-5367
...
[stable12] Fix unknown share token error message
2017-06-13 17:23:29 -05:00
9e402df41d
Merge pull request #5388 from nextcloud/stable12-5378
...
[stable12] no themed icon when dragging folder
2017-06-13 17:23:02 -05:00
db83fb7e76
Merge pull request #5389 from nextcloud/stable12-5305
...
[stable12] Add quota to the files view
2017-06-13 17:22:39 -05:00
b2cd3107b8
Merge pull request #5382 from nextcloud/global-scale-settings-stable12
...
[stable12] fix "add to your nextcloud" input field
2017-06-13 14:43:02 -05:00
cd9fb8cdf0
Merge pull request #5385 from nextcloud/stable12-revert-5259
...
[stable12] Revert "allow admin to disable groups on personal page"
2017-06-13 14:38:38 -05:00
Joas Schilling
Nextcloud bot
Morris Jobke
Julius Härtl
Robin Appelman
Yaojin Qian
Lukas Reschke
Arthur Schiwon
Patrik Kernstock
Christoph Wurst
Michael Munger