d7b3402643
Merge pull request #2719 from nextcloud/behat-transferownership
...
[downstream] Behat transferownership
2016-12-20 21:50:19 +01:00
4c315082e1
Merge pull request #2769 from nextcloud/improve_user_user_coverage
...
Improve OC\User\User coverage
2016-12-20 16:50:44 +01:00
09caadac05
Add tests for 2FA commands
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-20 16:36:58 +01:00
d78b0fa891
Merge pull request #2765 from nextcloud/kill-repairlegacystorages
...
[downstream] Remove obsolete RepairLegacyStorages repair step
2016-12-20 15:43:27 +01:00
88b7d033df
fix 2fa activities tests
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-20 15:23:36 +01:00
f50252c7c1
[tx-robot] updated from transifex
2016-12-20 12:02:31 +00:00
7b4265ab59
Improve OC\User\User coverage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-20 11:47:08 +01:00
089210f2df
Merge pull request #2774 from nextcloud/fix-2585
...
remove frequent, unimportant log message
2016-12-20 11:03:54 +01:00
e9727440dd
Only don't resolve public links
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-20 08:52:46 +01:00
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
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
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
1287e624dd
Merge pull request #2762 from nextcloud/add-js-computerFileSize
...
[downstream] Add js computer file size
2016-12-19 20:01:22 +01:00
6947410b6f
Update autoloader files
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 19:46:18 +01:00
252eddadd9
Remove obsolete RepairLegacyStorages repair step
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:45:46 +01:00
322b8ba138
Fix finding transferred folder in integration tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:41:11 +01:00
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
450373fd18
Fix indentation
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:34:55 +01:00
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
d4c088cb79
Verify input, add more unit tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:29:20 +01:00
ec4bca619d
Add test for unparseable string
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:29:13 +01:00
ff018d48cf
Implements all comments from @PVince81
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:29:05 +01:00
6217393d6a
Adding computerFileSize in OC.Util
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:28:58 +01:00
1afdce9ef8
Merge pull request #2757 from nextcloud/cron-5.6
...
Also check in cron for old php version
2016-12-19 17:22:10 +01:00
9473ab5c19
Remove config change hook that deletes link shares ( #26612 )
...
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.
A future cleanup could be done through a background job.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
29a1ebc362
Adjust integration test to Nextcloud branding
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:12:17 +01:00
04cf77120c
Fix error when $view is null when being passed into some plugins
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:53:13 +01:00
6345748a70
Fix "Call to a member function getUID() on null"
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:18 +01:00
b19aad88fb
No challenge within federated auth
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:10 +01:00
4a823188a9
Allow registration of federated auth
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:00 +01:00
dcbf434841
Register only one dav auth backend
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:52 +01:00
734e55da95
Add test for duplicate 401 headers on DAV
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:25 +01:00
2ae15ad37b
Merge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the-space
...
Use a form so firefox doesn't try to save the space as a password
2016-12-19 15:38:45 +01:00
3eb3e437c8
Add proper tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:35:31 +01:00
1741fe0310
Also check in cron for old php version
...
Fixes #2756
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-19 15:31:24 +01:00
3f4ba2d15d
fix typo
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 15:01:23 +01:00
16a55d5521
Merge pull request #2754 from nextcloud/activities-manager-publish-exception
...
Activities IManager throws an BadMethodCallException
2016-12-19 15:00:17 +01:00
34fb313466
Merge pull request #2689 from andreas-p/fix-remote-conflict
...
Fix showConflict
2016-12-19 14:34:56 +01:00
d5ad642d18
Activities IManager throws an BadMethodCallException
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 14:15:19 +01:00
7b5c28ab2a
Adjust to Nextcloud changes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 14:10:13 +01:00
55bf9e3f71
Add transfer ownership integration tests ( #26543 )
...
* Add transfer ownership integration tests
* Added more transfer ownership tests and OCC checks
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 14:10:12 +01:00
eed0eaeb86
Use a form so firefox doesn't try to save the space as a password
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-19 12:43:31 +01:00
5bad93472d
catch specific BadMethodCallException
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 12:01:32 +01:00
ed4017dfb4
fix minor issues
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:48 +01:00
9300312046
push activity when backup codes are generated
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
7ae9442f3d
Publish, parse and filter 2FA activities
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
9b71ee27ff
Merge pull request #2727 from nextcloud/fix-colon-issue
...
[downstream] Fix colon issue
2016-12-19 10:19:15 +01:00
4f79d2ff0d
Merge pull request #2721 from nextcloud/ocs-die-on-exception
...
[downstream] Die in OCS v1.php on exception
2016-12-19 08:38:02 +01:00
f54547ff1c
Merge pull request #2723 from nextcloud/integrity-exit-code
...
[downstream] Return 1 if integrity check is failed. Fixes #22806
2016-12-19 08:37:43 +01:00
c7fc010215
Fix showConflict
...
use getFullFileName to show conflicting file
add original.directory to make fileExists happy
Signed-off-by: Andreas Pflug <dev@admin4.org>
2016-12-19 08:11:04 +01:00
Lukas Reschke
Morris Jobke
Roeland Jago Douma
Christoph Wurst
Christoph Wurst
Nextcloud bot
Arthur Schiwon
Vincent Petry
Michael Jobst
Patrick Paysant
Thomas Müller
Thomas Citharel
Robin Appelman
Joas Schilling
Roeland Jago Douma
pflug