Patrick Paysant
6217393d6a
Adding computerFileSize in OC.Util
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:28:58 +01:00
Lukas Reschke
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
Vincent Petry
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
Lukas Reschke
29a1ebc362
Adjust integration test to Nextcloud branding
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:12:17 +01:00
Thomas Müller
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
Thomas Müller
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
Thomas Müller
b19aad88fb
No challenge within federated auth
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:10 +01:00
Thomas Müller
4a823188a9
Allow registration of federated auth
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:00 +01:00
Thomas Citharel
dcbf434841
Register only one dav auth backend
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:52 +01:00
Vincent Petry
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
Lukas Reschke
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
Lukas Reschke
3eb3e437c8
Add proper tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:35:31 +01:00
Roeland Jago Douma
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
Christoph Wurst
3f4ba2d15d
fix typo
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 15:01:23 +01:00
Robin Appelman
16a55d5521
Merge pull request #2754 from nextcloud/activities-manager-publish-exception
...
Activities IManager throws an BadMethodCallException
2016-12-19 15:00:17 +01:00
Lukas Reschke
34fb313466
Merge pull request #2689 from andreas-p/fix-remote-conflict
...
Fix showConflict
2016-12-19 14:34:56 +01:00
Christoph Wurst
d5ad642d18
Activities IManager throws an BadMethodCallException
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 14:15:19 +01:00
Lukas Reschke
7b5c28ab2a
Adjust to Nextcloud changes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 14:10:13 +01:00
Vincent Petry
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
Joas Schilling
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
Christoph Wurst
5bad93472d
catch specific BadMethodCallException
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 12:01:32 +01:00
Christoph Wurst
ed4017dfb4
fix minor issues
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:48 +01:00
Christoph Wurst
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
Christoph Wurst
7ae9442f3d
Publish, parse and filter 2FA activities
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
Roeland Jago Douma
9b71ee27ff
Merge pull request #2727 from nextcloud/fix-colon-issue
...
[downstream] Fix colon issue
2016-12-19 10:19:15 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
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
pflug
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
Christoph Wurst
8a21fc0908
Merge pull request #2726 from nextcloud/check-all-channels
...
[downstream] Consider all channel except blank and git to be signed
2016-12-18 23:12:57 +01:00
Christoph Wurst
c80465a68c
Merge pull request #2735 from nextcloud/fix-settingsmenu
...
Adjust shadows and fix positioning in header menus
2016-12-18 20:50:20 +01:00
Julius Haertl
1ad3613307
Adjust shadows and fix positioning
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-17 20:06:19 +01:00
Lukas Reschke
ad725de9ad
Update third-party ref for new sabre/uri version
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-17 19:42:47 +01:00
Roeland Jago Douma
a60479a3d3
Merge pull request #2725 from nextcloud/memcached-connect-once
...
[downstream] Set options, then add servers
2016-12-17 19:31:31 +01:00
Roeland Jago Douma
abf302bef8
Merge pull request #2722 from nextcloud/failed-to-create-share-fix
...
[downstream] commit transaction after select query
2016-12-17 19:28:54 +01:00
Roeland Jago Douma
dfc17c9ae1
Merge pull request #2720 from nextcloud/fix-25692
...
[downstream] Do not validate return code is set is successful
2016-12-17 19:27:23 +01:00
Vincent Petry
553883a1f4
Add integration test for creating folder with colon
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 18:16:35 +01:00
Victor Dubiniuk
852de31ecb
Consider all channel except blank and git to be signed
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 18:07:30 +01:00
Victor Dubiniuk
46a7cb493f
Set options, then add servers
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:56:39 +01:00
Victor Dubiniuk
e536313451
Update tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:51:03 +01:00
Victor Dubiniuk
876754a5a5
Check return value for file_put_contents. Add return value to the commands
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:50:58 +01:00
Victor Dubiniuk
93a8eba137
Return 1 if integrity check is failed. Fixes #22806
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:48:37 +01:00
phisch
fc67606d39
commit transaction after select query
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:44:33 +01:00
Vincent Petry
00f135d320
Die in OCS v1.php on exception
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:35:42 +01:00
Victor Dubiniuk
c5754a5ec5
Do not validate return code is set is successful
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:33:28 +01:00
Lukas Reschke
b0c1460a1d
Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade
...
Clear appstore cache on version upgrade
2016-12-16 17:14:53 +01:00
Roeland Jago Douma
f86f4eb98d
Merge pull request #2504 from nextcloud/downstream-ldap-15
...
Downstream LDAP Range Support
2016-12-16 16:40:04 +01:00
Lukas Reschke
00b4dedef5
Merge pull request #2550 from nextcloud/smb-notify-rename
...
Fix order of parameters when getting notified of smb renames
2016-12-16 16:11:39 +01:00
Lukas Reschke
058b536aea
Merge pull request #2714 from amittel/patch-1
...
Changed anchor
2016-12-16 15:52:06 +01:00
Lukas Reschke
511056dd3f
Merge pull request #1678 from nextcloud/smb-stat-root
...
Fix mtimes for share root
2016-12-16 13:41:33 +01:00
Lukas Reschke
9aef75cb36
Merge pull request #2398 from nextcloud/fix-2368
...
flicker-free permission change in share dialog
2016-12-16 13:35:33 +01:00