8e0060405d
reorganize file in lib
2013-09-30 16:39:03 +02:00
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
26785c9e0d
Remove getContent() from IRequest
2013-09-30 16:30:36 +02:00
4e9a95f3e9
Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
...
Conflicts:
lib/appframework/http/request.php
tests/lib/appframework/http/RequestTest.php
2013-09-30 16:27:00 +02:00
b0be2c79dc
Remove JSON request parsing from Server
2013-09-30 16:24:47 +02:00
1d2466c6d1
Add assertions for ->params and array access with json
2013-09-30 16:23:43 +02:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
d4fed61871
Merge pull request #5012 from owncloud/check_keyfiles_exists
...
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-30 06:55:56 -07:00
092b4e7b53
Implement PUT an PATCH support
2013-09-30 15:35:07 +02:00
2115db3892
Add interface docs to IRequest.
2013-09-30 15:35:07 +02:00
35fae7aaf8
Add patch method to OC_Route
2013-09-30 15:35:07 +02:00
50fc5e8792
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-09-30 15:35:07 +02:00
67d4b77e8e
revert changes in personal template
2013-09-30 15:11:01 +02:00
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
084f76fd14
grammar fixes
2013-09-30 13:33:49 +02:00
17aa49a890
fix mail subject; don't show time for expire date
2013-09-30 13:33:02 +02:00
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
513dc20d4b
also return success if no shares are found.
2013-09-30 13:05:34 +02:00
6d830087db
add testUpdateShareUpload()
2013-09-30 12:57:55 +02:00
03db954e1a
add getShareFromFolder() test
2013-09-30 12:38:36 +02:00
9a2e82c3c5
Make sure that testDeleteShare() has some shares to delete
2013-09-30 12:23:44 +02:00
c62dc4fa80
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 11:36:08 +02:00
ebb2278a67
Merge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin-master
...
Move aborted upload detection into it's own sabedav plugin
2013-09-30 02:31:51 -07:00
fdc87eaeb3
adding test testSimplePutFailsOnRename()
2013-09-30 11:30:34 +02:00
92c02e6797
remove commented code
2013-09-30 10:58:03 +02:00
e3dee63339
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
2013-09-30 10:46:50 +02:00
629faf6d34
Merge branch 'master' into appframework-master
2013-09-30 10:42:05 +02:00
029abc9c43
mail is already themable via the template, no need to provide additional string in OC_Defaults
2013-09-30 10:03:12 +02:00
aaba0d83b5
fixing PHPDoc & typo
2013-09-30 10:03:07 +02:00
b9a1f63344
go back to old template but add expire date as optional content
2013-09-30 10:02:26 +02:00
952433eae6
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
2013-09-30 09:21:37 +02:00
5899485ca1
Merge pull request #4969 from owncloud/fixing-4043-master
...
adding privilege check on move and rename operations
2013-09-30 00:20:34 -07:00
4032065ec6
Merge pull request #3563 from evgeni/curl-no-timeout
...
cURL does not honour default_socket_timeout
2013-09-30 00:08:32 -07:00
b6fc143074
cURL does not honour default_socket_timeout
...
SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.
One has to use
curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.
2013-09-30 07:56:54 +02:00
1efbf7774f
Fixed review issues
2013-09-29 20:16:32 -04:00
9ba0edcadb
Merge pull request #4966 from owncloud/text_preview_blacklist
...
add blacklist to txt preview backend
* owncloud/text_preview_blacklist:
rename variable in testIsTransparent
rename testTxtBlacklist to txtBlacklist
move fileView object initialization to testIsTransparent
use dataProvider for txt blacklist test
add test for txt blacklist
add test data for cal and contact preview
add blacklist to txt preview backend
2013-09-29 23:20:34 +02:00
258e8d58da
flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted
2013-09-29 22:20:42 +02:00
63ea6844e8
- adding unit test testGetShareFromUnknownId()
...
- fixing getShareFromId() for Oracle
- fixing error message
2013-09-29 22:16:48 +02:00
a79294771b
Merge pull request #4960 from owncloud/fixing-mirall-1014-master
...
handle error situation of rename proper
2013-09-29 12:49:10 -07:00
5462e199d3
Merge branch 'master' into appframework-master
2013-09-29 20:07:56 +02:00
88d5e8fbca
Merge pull request #5031 from zimba12/master
...
followup of #4032 - makes the settings-button bigger...
2013-09-29 09:26:47 -07:00
710d3f139f
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation
2013-09-29 01:46:23 -04:00
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
adcb738e47
initialize $middleWares
2013-09-28 20:40:25 +02:00
6979fd343b
Merge branch 'master' into appframework-master
2013-09-28 20:39:19 +02:00
1097c3ce63
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
...
Base defaultavatar text on displayname
2013-09-28 08:52:22 -07:00
24d092c4ba
Have uniform (wrong) indention
2013-09-28 17:49:07 +02:00
4907685405
Base defaultavatar text on displayname
...
Fix #4876
2013-09-28 16:46:53 +02:00
cb565a5f60
Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
...
phpunit.xml: Port code coverage excludes from autotest to dist.
2013-09-28 06:50:34 -07:00
d124b6965b
Implement PUT an PATCH support
2013-09-28 01:35:24 +02:00
Thomas Müller
Thomas Tanghus
Morris Jobke
Bjoern Schiessle
Evgeni Golov
vsapronov
Andreas Fischer
Alessandro Cosentino
kondou