upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-15 01:49:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 30
39506 commits 928 branches 1207 tags 8.1 GiB
Commit graph

16239 commits

Author SHA1 Message Date
Roger Szabo
ff286cd131 Rectify variable $uid->$user 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-07-10 18:38:30 +08:00
Roger Szabo
500d2a0e2e pass missing function parameter 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-07-10 15:17:05 +08:00
Roger Szabo
b725738870 css for button adjustment for nc12 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-07-10 15:16:55 +08:00
Roger Szabo
3e7a49e009 set needsPasswordReset flag correctly 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-07-10 15:16:42 +08:00
Roger Szabo
28933322a2 suppress superflous php error on rejected password change 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-07-10 15:16:12 +08:00
Nextcloud bot
28a37f04dc
[tx-robot] updated from transifex 2017-07-10 00:08:51 +00:00
Nextcloud bot
0324993342
[tx-robot] updated from transifex 2017-07-09 00:08:41 +00:00
Nextcloud bot
f80159f52a
[tx-robot] updated from transifex 2017-07-08 00:08:37 +00:00
Morris Jobke
a5182ab7c1 Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails 
[stable12] Use PNG icons for activity emails and ios client
 2017-07-07 14:04:01 +02:00
Björn Schießle
8ad1123d5d Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares 
[stable12] Use the share_folder config for remote shares
 2017-07-07 11:54:11 +02:00
Joas Schilling
a6bae8ac44
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 11:16:54 +02:00
Joas Schilling
87e69b5510
Use PNG version of the icons for shipped activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 11:16:44 +02:00
Nextcloud bot
a1f3f1783e
[tx-robot] updated from transifex 2017-07-07 00:08:35 +00:00
Joas Schilling
596380a62f Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam 
[stable12] Don't try to generate logs for chunking paths
 2017-07-06 08:43:39 +02:00
Nextcloud bot
f2ac9c6582
[tx-robot] updated from transifex 2017-07-06 00:08:53 +00:00
Joas Schilling
79f6773ef9
Don't log passwords on dav exceptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 15:10:38 +02:00
Jos Poortvliet
68b6c3fca8 Update admin.php 
add a note on our staged roll-out.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-05 11:40:26 +02:00
Nextcloud bot
3db7bd196d
[tx-robot] updated from transifex 2017-07-05 00:08:36 +00:00
Morris Jobke
29fdffb1af Merge pull request #5525 from nextcloud/stable12-5517 
[stable12] Enhance the logging if the part file can not be renamed
 2017-07-04 19:36:08 +02:00
Morris Jobke
2459eb80a7 Improve logging of trash bin inconsistencies 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-04 11:14:59 +02:00
Morris Jobke
0d7d00d681 Merge pull request #5583 from nextcloud/stable12-5450 
[stable12] Fix more icon in apps menu on bright backgrounds
 2017-07-04 11:01:12 +02:00
Nextcloud bot
2711dbb445
[tx-robot] updated from transifex 2017-07-03 00:08:31 +00:00
Julius Härtl
9c1cfbe154
Fix more icon in apps menu on bright backgrounds 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-02 14:02:51 +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
8a0a09eb90 Enhance the logging if the part file can not be renamed 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-23 16:07:21 -05: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
Nextcloud bot
99d04b1917
[tx-robot] updated from transifex 2017-06-21 00:08:24 +00: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
Joas Schilling
b94a7a0ba3
Use the share_folder config for remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-19 10:21:56 +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
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
Joas Schilling
9c2c42c7cc
Don't try to generate logs for chunking paths 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-16 10:42:07 +02:00
Nextcloud bot
3cb59ac602
[tx-robot] updated from transifex 2017-06-16 00:08:53 +00: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
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
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