wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
36789 commits 157 branches 562 tags 714 MiB
Commit graph

36789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
1588dd0ee0 Merge pull request #2802 from nextcloud/trash-improvements 
let the owner restore files if they where moved out of a shared folder
 2016-12-22 11:00:25 +01:00
Vincent Petry
34d466b2f6
Fallback to share link owner when no owner found 
When creating link shares from external storage, the filesystem cannot
find an owner in some scenarios (ex: system-wide mounts). In such
cases, fall back to using the current user's trashbin which happens to
also be the user who created the link share.

Fixes an issue where this scenario made deletion impossible due to
missing user information.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 10:48:32 +01:00
Joas Schilling
8f664a00e1 Merge pull request #2803 from nextcloud/hide-notification-for-updates 
Hide update notification if notification center is enabled
 2016-12-22 10:39:15 +01:00
Sergio Bertolín
928f113361
Return explicit values instead of boolean from sabre (#26654) 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 10:10:29 +01:00
Lukas Reschke
86066028de Merge pull request #2811 from nextcloud/extended_apcu_cas 
Extend APCu test with int CAS
 2016-12-22 10:09:16 +01:00
Morris Jobke
f88d615445 Merge pull request #2808 from alantygel/patch-1 
Translation string corrected > 1 user
 2016-12-22 10:04:35 +01:00
Thomas Müller
2bf4661e40
Just use moment to comupte the time left for the upload - translations are delivered as part of moment.js - fixes #26804 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 10:01:58 +01:00
Nextcloud bot
0b64e96c9b
[tx-robot] updated from transifex 2016-12-22 01:07:28 +00:00
Roeland Jago Douma
065f2fbcc6
Extend APCu test with int CAS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-21 21:06:41 +01:00
Roeland Jago Douma
2067f7f411
Disable memcached binary protocol 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-21 20:55:42 +01:00
Roeland Jago Douma
7d5cd98c17
Add Memcached CI 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-21 20:55:42 +01:00
Alan Tygel
efff51c7a8 Translation string corrected > 1 user 2016-12-21 16:34:24 -03:00
Bjoern Schiessle
a1d6f3068a
make code more robust 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-21 18:02:19 +01:00
Bjoern Schiessle
60810b44bc
check for class name in case class is not loaded 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-21 17:28:50 +01:00
Bjoern Schiessle
0e4eeab3c1
add a copy to the owners trash bin if another user moves a file out of a shared folder 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-21 17:28:47 +01:00
Morris Jobke
d5036fd4af Merge pull request #2792 from nextcloud/update-drone-images 
update drone images to latest version
 2016-12-21 15:52:51 +01:00
Morris Jobke
d498d0982e
Hide update notification if notification center is enabled 
* then the notification center already contains this info

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-21 15:44:06 +01:00
Morris Jobke
430b4718fb Merge pull request #2796 from nextcloud/set-exit-code-to-1-if-test-is-failing 
Set exit code to 1 if integration test is failing
 2016-12-21 15:18:09 +01:00
Lukas Reschke
591b60d11c Merge pull request #2758 from nextcloud/only-one-dav-backend 
Register only one dav backend
 2016-12-21 13:03:48 +01:00
Lukas Reschke
091bf07385 Merge pull request #2724 from nextcloud/fix-23591 
[downstream] Report failures for SignApp and SignCore
 2016-12-21 13:03:13 +01:00
Lukas Reschke
0d138c8591 Merge pull request #2784 from nextcloud/2fa_command_tests 
Add tests for 2FA commands
 2016-12-21 12:32:36 +01:00
Nextcloud bot
fe9a38d5b5
[tx-robot] updated from transifex 2016-12-21 01:07:18 +00:00
Lukas Reschke
7efc6b2614
Set exit code to 1 if integration test is failing 
Before it just checked the unit tests and ignored the integration test results. See https://drone.nextcloud.com/nextcloud/server/3374/35 for details.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-20 23:40:49 +01:00
Morris Jobke
2fc9265b03
update drone images to latest version 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-20 23:34:14 +01:00
Morris Jobke
e3dfe2cba7 Merge pull request #2790 from nextcloud/update-integration-test-image 
Update integration test image
 2016-12-20 23:24:18 +01:00
Lukas Reschke
f0bb62f2fe Merge pull request #2273 from nextcloud/fix_invalid_calendar 
Add DAV repair step to fix calendar data
 2016-12-20 23:09:27 +01:00
Lukas Reschke
07b0bcda39 Merge pull request #2789 from nextcloud/add-smb-tests 
Add SMB tests execution and execute files_external tests
 2016-12-20 23:03:13 +01:00
Lukas Reschke
d32e0d57e0
Run coverage 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-20 22:25:49 +01:00
Lukas Reschke
1c80307537
Add SMB tests and execute files_external tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-20 22:05:33 +01:00
Lukas Reschke
d37bc304f1
Update integration test image 
Updates the composer dependencies so running the tests should now be faster again…

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-20 21:56:16 +01:00
Lukas Reschke
d7b3402643 Merge pull request #2719 from nextcloud/behat-transferownership 
[downstream] Behat transferownership
 2016-12-20 21:50:19 +01:00
Morris Jobke
4c315082e1 Merge pull request #2769 from nextcloud/improve_user_user_coverage 
Improve OC\User\User coverage
 2016-12-20 16:50:44 +01:00
Roeland Jago Douma
09caadac05
Add tests for 2FA commands 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-20 16:36:58 +01:00
Christoph Wurst
d78b0fa891 Merge pull request #2765 from nextcloud/kill-repairlegacystorages 
[downstream] Remove obsolete RepairLegacyStorages repair step
 2016-12-20 15:43:27 +01:00
Christoph Wurst
88b7d033df fix 2fa activities tests 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-20 15:23:36 +01:00
Nextcloud bot
f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Roeland Jago Douma
7b4265ab59
Improve OC\User\User coverage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-20 11:47:08 +01:00
Lukas Reschke
089210f2df Merge pull request #2774 from nextcloud/fix-2585 
remove frequent, unimportant log message
 2016-12-20 11:03:54 +01:00
Roeland Jago Douma
e9727440dd
Only don't resolve public links 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-20 08:52:46 +01:00
Lukas Reschke
5983c68462
Don't resolve public share token if public sharing is disabled 
Otherwise disabling sharing does prevent access to the view controllers but one can still access the shares using the public preview route or the public WebDAV endpoint.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-20 08:52:46 +01:00
Arthur Schiwon
7887566cff
remove frequent, unimportant log message 
Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-19 23:36:11 +01:00
Christoph Wurst
084bddf8ae Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesort 
[downstream] When grouping shares, sort by stime then id (#26777)
 2016-12-19 21:40:42 +01:00
Lukas Reschke
1287e624dd Merge pull request #2762 from nextcloud/add-js-computerFileSize 
[downstream] Add js computer file size
 2016-12-19 20:01:22 +01:00
Lukas Reschke
6947410b6f
Update autoloader files 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 19:46:18 +01:00
Vincent Petry
252eddadd9
Remove obsolete RepairLegacyStorages repair step 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:45:46 +01:00
Vincent Petry
322b8ba138
Fix finding transferred folder in integration tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:41:11 +01:00
Vincent Petry
000ba6484f
When grouping shares, sort by stime then id (#26777) 
If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:38:33 +01:00
Lukas Reschke
450373fd18
Fix indentation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:34:55 +01:00
Michael Jobst
a7526b9837
Style modifications of favorite star on main detail view (#26658) 
* Style modifications of favorite star on main detail view

* Removed unused opacity change on mouse over

* favorite star title fixed

* favorite star opacity should  always be .7

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:34:09 +01:00
Patrick Paysant
d4c088cb79
Verify input, add more unit tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:20 +01:00