upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 16:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
34188 commits 1001 branches 1208 tags 8.5 GiB
Commit graph

34188 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
cf752bea22 Merge pull request #2485 from nextcloud/shared-storage-mask-10 
[10] 	apply permissions mask for shared storage
 2016-12-03 23:35:40 +01:00
Nextcloud bot
c20532c01e
[tx-robot] updated from transifex 2016-12-03 01:07:34 +00:00
Roeland Jago Douma
4994110890 Merge pull request #2489 from nextcloud/update-cache-success-10 
[10] only update the cache if the storage operation succeeds
 2016-12-02 20:06:44 +01:00
Robin Appelman
d84f88b041
only update the cache if the storage operation succeeds 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 18:56:11 +01:00
Robin Appelman
b8d0975a0a
update test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 18:04:40 +01:00
Robin Appelman
2dd97bb52d
apply permissions mask for shared storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 18:02:34 +01:00
Joas Schilling
6c1278c1cc Merge pull request #2463 from nextcloud/stable10-2306 
[stable10] Don't log the user password in case something goes wrong
 2016-12-02 10:47:45 +01:00
Morris Jobke
ed71ecc2b2 Merge pull request #2452 from nextcloud/stable10-1826 
[stable10] Fix post_unshareFromSelf hook parameter format
 2016-12-02 10:41:57 +01:00
Morris Jobke
8f8250caf4 Merge pull request #2460 from nextcloud/stable10-2010 
[stable10] Fixed disappearing of share info in file view
 2016-12-02 10:39:55 +01:00
Morris Jobke
8eb39667bb Merge pull request #2454 from nextcloud/stable10-1872 
[stable10] Fix misleading SSL/TLS SMTP email configuration
 2016-12-02 10:38:51 +01:00
Morris Jobke
37aa1da951 Merge pull request #2456 from nextcloud/stable10-1658 
[stable10] Default to empty string
 2016-12-02 10:38:07 +01:00
Morris Jobke
a61c69db8c Merge pull request #2451 from nextcloud/stable10-2410 
[stable10] Fix missing text for downloads on mobile
 2016-12-02 10:37:25 +01:00
Joas Schilling
d74af7f317 Merge pull request #2459 from nextcloud/stable10-2084 
[stable10] Fixes files_drop when avatars are disabled
 2016-12-02 10:21:11 +01:00
Roeland Jago Douma
1d5049acbe Merge pull request #2457 from nextcloud/stable10-1712 
[stable10] Tear down FS between cron jobs (#26223)
 2016-12-02 08:16:24 +01:00
Roeland Jago Douma
7be6326852 Merge pull request #2449 from nextcloud/stable10-1745 
[stable10] fix typo
 2016-12-02 08:14:47 +01:00
Nextcloud bot
0a10dadef6
[tx-robot] updated from transifex 2016-12-02 01:07:43 +00:00
Joas Schilling
366df29340
Don't log the user password in case something goes wrong 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-02 01:41:04 +01:00
Michael Jobst
86ef7c8185
Fixed disappearing of share info in file view 2016-12-02 01:21:09 +01:00
Roeland Jago Douma
c6c1bd1e19
Fixes files_drop when avatars are disabled 
Fixes: #2080

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-02 01:16:33 +01:00
Vincent Petry
4543590da1
[master] Tear down FS between cron jobs (#26223) 
Because some cron jobs do not always properly clean up their FS usage
and others might not clean up before setting up the FS, this could
cause potential side effects.

To make sure we exclude side effects, we tear down the FS between cron
jobs.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-02 01:12:05 +01:00
Lukas Reschke
5efb7ed043
Default to empty string 
Otherwise `null` is returned which leads to a ton of similar error messages if the log condition setting is enabled.:

```
{"reqId":"3wVBarnDfOV3qkI1bVCU","remoteAddr":"89.98.78.41","app":"PHP","message":"hash_equals(): Expected user_string to be a string, null given at \/var\/www\/html\/lib\/private\/Log.php#275","level":3,"time":"2016-10-07T14:22:15+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/","user":"icewind"}
```
 2016-12-02 01:09:04 +01:00
Joas Schilling
ff7cb2f16a
Fix misleading SSL/TLS SMTP email configuration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-02 01:05:54 +01:00
Vincent Petry
f07c209cb9
Fix post_unshareFromSelf hook parameter format 
When unsharing from self in a group share situation, the share items
passed to the post_unshareFromSelf hook were using the wrong format in
which the attribute names (ex: "share_type") have non camel-case format.

This fix makes sure that in group sharing case we use the correct
format. It looks like the code was already producing it but in
array_merge it was not using it and adding the unprocessed one.
 2016-12-02 00:50:32 +01:00
Morris Jobke
f39a308527
Fix missing text for downloads on mobile 
* fixes #2362

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-02 00:47:11 +01:00
Thomas Citharel
1700224b62
fix typo 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-12-02 00:36:57 +01:00
Morris Jobke
1c4a1b8807 Merge pull request #2445 from nextcloud/stable10-detect-also-a-400-status 
[stable10] Catch status code 400
 2016-12-01 22:56:39 +01:00
Roeland Jago Douma
c0f5f0a029 Merge pull request #2438 from nextcloud/stable10-dont-allow-subfolders-for-write-only-shares 
[stable10] On write-only shares do not allow to specify subfolders
 2016-12-01 20:19:52 +01:00
Lukas Reschke
461b277742
[stable10] Catch status code 400 
In case the server returns a statuscode 400 we should also gracefully return to the home directory.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-01 19:15:19 +01:00
Lukas Reschke
d012965053 Merge pull request #2440 from nextcloud/stable10-optimize-createParentDirectories 
[stable10] Prevent endless loop in \OC\Files\View::createParentDirect…
 2016-12-01 19:02:31 +01:00
Lukas Reschke
072794d78d
[stable10] Prevent endless loop in \OC\Files\View::createParentDirectories 
\OC\Files\View::createParentDirectories was previously prone to an endless loop. If a path such as /foo/existingfile.txt/bar/foo was passed and existingfile.txt existed in foo the loop was never left and running until the PHP process timed out.

This commit changes the logic to a foreach loop over an array and additionally additional error handling using is_file.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-01 16:53:26 +01:00
Lukas Reschke
4045c7be73
[stable10] On write-only shares do not allow to specify subfolders 
In case of a write-only share we should not allow to specify a subfolder as this is unexpected behaviour.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-01 16:12:25 +01:00
Nextcloud bot
db2206450f
[tx-robot] updated from transifex 2016-12-01 01:07:24 +00:00
Nextcloud bot
7a32bd49d8
[tx-robot] updated from transifex 2016-11-30 14:18:15 +00:00
Nextcloud bot
1e818369a7
[tx-robot] updated from transifex 2016-11-30 01:07:24 +00:00
Nextcloud bot
823f480c83
[tx-robot] updated from transifex 2016-11-29 17:57:54 +00:00
Nextcloud bot
cb910bfacc
[tx-robot] updated from transifex 2016-11-29 17:03:32 +00:00
Nextcloud bot
506196af6c
[tx-robot] updated from transifex 2016-11-29 01:06:54 +00:00
Nextcloud bot
74072d75d5
[tx-robot] updated from transifex 2016-11-28 09:52:03 +00:00
Nextcloud bot
d1b0300d45
[tx-robot] updated from transifex 2016-11-28 09:31:09 +00:00
Nextcloud bot
feefc9ed0b
[tx-robot] updated from transifex 2016-11-28 01:07:09 +00:00
Nextcloud bot
30c4f46d2a
[tx-robot] updated from transifex 2016-11-27 01:07:19 +00:00
Nextcloud bot
14a003eb32
[tx-robot] updated from transifex 2016-11-26 01:07:06 +00:00
Lukas Reschke
eefc8ce961 Merge pull request #2320 from nextcloud/fix-getFileSizeViaCOM-regression 
[stable10] Fix get file size via com regression
 2016-11-24 22:21:42 +01:00
Morris Jobke
28eed678e0
Fix regressiong from #2048 
* fixes https://github.com/nextcloud/server/pull/2048#issuecomment-262826162

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-24 20:54:33 +01:00
Morris Jobke
f7a505ded6 Merge pull request #2291 from nextcloud/stable10-imagescale-fix 
[stable10] Workaround for PHP bug when calling imagescale
 2016-11-24 12:02:36 +01:00
Joas Schilling
f7388575a8 Merge pull request #2295 from nextcloud/backport-2137-phpunit4-compatibility 
Add a wrapper to allow phpunit4 to run the code again
 2016-11-24 10:00:09 +01:00
Joas Schilling
ac5a6b2d30
Add a magic wrapper from hell to allow phpunit4 to run the code again 
Remove this once phpunit 5 is the lowest supported version, by reverting:
https://github.com/nextcloud/server/pull/2137

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-24 09:11:47 +01:00
Julius Haertl
c96bbd4953
Workaround for PHP bug when calling imagescale 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-23 21:54:55 +01:00
Nextcloud bot
fee91b1073
[tx-robot] updated from transifex 2016-11-22 01:07:03 +00:00
Nextcloud bot
c688613f5f
[tx-robot] updated from transifex 2016-11-21 01:07:05 +00:00