Commit Graph

39465 Commits

Author SHA1 Message Date
Julius Härtl 4c3b27da5c
Do not open version file again
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl 3801c3aa3f
Make cache and scss caching depend on the baseUrl
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Nextcloud bot f02575db94
[tx-robot] updated from transifex 2017-07-02 00:08:23 +00:00
Nextcloud bot 4b6e5efd7e
[tx-robot] updated from transifex 2017-07-01 00:08:38 +00:00
Nextcloud bot c892043dc9
[tx-robot] updated from transifex 2017-06-30 00:08:35 +00:00
Nextcloud bot af6e02976a
[tx-robot] updated from transifex 2017-06-29 00:08:35 +00:00
Nextcloud bot 2767165d7f
[tx-robot] updated from transifex 2017-06-28 00:08:28 +00:00
Nextcloud bot d13010ed2b
[tx-robot] updated from transifex 2017-06-27 00:08:26 +00:00
Nextcloud bot 31422c9c6e
[tx-robot] updated from transifex 2017-06-26 00:08:40 +00:00
Nextcloud bot 5e22b33096
[tx-robot] updated from transifex 2017-06-25 00:08:27 +00:00
Nextcloud bot 33bc17564c
[tx-robot] updated from transifex 2017-06-24 00:08:39 +00:00
Morris Jobke 8550fdf757 Merge pull request #5507 from derkostka/stable12
[stable12] Use realpath to obtain the webroot
2017-06-23 15:43:15 -05:00
Morris Jobke cb9a6a81a4 Merge pull request #5521 from nextcloud/backport-5508-no-acitivity-before-login
[stable12] Don't create activities for email and password change before login
2017-06-23 11:23:50 -05:00
blizzz 0f7cb1fd65 Merge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-language
[stable12] Allow to force a language and set it via the ocs api
2017-06-23 14:24:05 +02:00
Joas Schilling 7e714ae971
Don't create activities for email and password change before login
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-23 12:27:21 +02:00
Nextcloud bot 70afe8d03b
[tx-robot] updated from transifex 2017-06-23 00:09:22 +00:00
Joas Schilling 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
Joas Schilling 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
Morris Jobke b0b39368b2
Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-22 09:56:07 +02:00
Joas Schilling aafb45456f
Add unit tests for the new code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:55:57 +02:00
Joas Schilling 4d18757a85
Allow to force a language and set it via the ocs api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:54:39 +02:00
Sebastian Kostka f0753cb56d [stable12] Use realpath to obtain the webroot
Use realpath to obtain the webroot - backport
Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com
2017-06-22 08:37:11 +02:00
Nextcloud bot 00256ee18e
[tx-robot] updated from transifex 2017-06-22 00:08:46 +00:00
Morris Jobke b150221fd0 Merge pull request #5489 from nextcloud/stable12-5061
[stable12] Fix example theme
2017-06-21 16:28:57 -05:00
Nextcloud bot 99d04b1917
[tx-robot] updated from transifex 2017-06-21 00:08:24 +00:00
Julius Härtl 1552924427
Move styles.css to server.css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-20 19:29:10 +02:00
Morris Jobke 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
Joas Schilling 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
Joas Schilling 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
Nextcloud bot 0277400618
[tx-robot] updated from transifex 2017-06-20 00:08:51 +00:00
Robin Appelman 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
Robin Appelman 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
Nextcloud bot deaa8b6885
[tx-robot] updated from transifex 2017-06-19 00:08:29 +00:00
Morris Jobke c3b58918f1 Merge pull request #5442 from Bekcpear/stable12
Fix upload remaining time and uploadrate value
2017-06-17 18:32:47 -05:00
Morris Jobke ab837da40b Merge pull request #5420 from nextcloud/stable12-appmenu-fixes
[stable12] App menu fixes
2017-06-17 18:28:59 -05:00
Nextcloud bot 0e608188d2
[tx-robot] updated from transifex 2017-06-17 00:08:36 +00:00
Yaojin Qian 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
Nextcloud bot 3cb59ac602
[tx-robot] updated from transifex 2017-06-16 00:08:53 +00:00
Morris Jobke 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
Joas Schilling 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
Morris Jobke 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
Lukas Reschke c93cad74f9 Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12
[stable12] Ldap attempt reconnect stable12
2017-06-15 13:29:42 +02:00
Arthur Schiwon 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
Julius Härtl 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
Patrik Kernstock 073d5dbc85
Decimal percentage, dynamic appIcon width
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:55:11 +02:00
Patrik Kernstock 6acabd64ca
Now using dynamic percentual appmenu limit
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:55:04 +02:00
Patrik Kernstock d44786e9b7
Closed #5121, remove appmenu limit
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:54:51 +02:00
Morris Jobke 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
Morris Jobke 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
Nextcloud bot 1965889fc8
[tx-robot] updated from transifex 2017-06-15 00:08:52 +00:00