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

14153 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Tanghus
092b4e7b53 Implement PUT an PATCH support 2013-09-30 15:35:07 +02:00
Thomas Tanghus
2115db3892 Add interface docs to IRequest. 2013-09-30 15:35:07 +02:00
Thomas Tanghus
35fae7aaf8 Add patch method to OC_Route 2013-09-30 15:35:07 +02:00
Thomas Tanghus
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
Bjoern Schiessle
67d4b77e8e revert changes in personal template 2013-09-30 15:11:01 +02:00
Bjoern Schiessle
4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00
Bjoern Schiessle
084f76fd14 grammar fixes 2013-09-30 13:33:49 +02:00
Bjoern Schiessle
17aa49a890 fix mail subject; don't show time for expire date 2013-09-30 13:33:02 +02:00
Thomas Müller
480aeb804f Merge pull request #4459 from owncloud/appframework-master 
Public API for OC6+ (includes AppFramework)
 2013-09-30 04:11:28 -07:00
Bjoern Schiessle
513dc20d4b also return success if no shares are found. 2013-09-30 13:05:34 +02:00
Bjoern Schiessle
6d830087db add testUpdateShareUpload() 2013-09-30 12:57:55 +02:00
Bjoern Schiessle
03db954e1a add getShareFromFolder() test 2013-09-30 12:38:36 +02:00
Bjoern Schiessle
9a2e82c3c5 Make sure that testDeleteShare() has some shares to delete 2013-09-30 12:23:44 +02:00
Thomas Müller
c62dc4fa80 Merge branch 'master' into fixing-4011-master 
Conflicts:
	lib/connector/sabre/directory.php
 2013-09-30 11:36:08 +02:00
Thomas Müller
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
Thomas Müller
fdc87eaeb3 adding test testSimplePutFailsOnRename() 2013-09-30 11:30:34 +02:00
Thomas Müller
92c02e6797 remove commented code 2013-09-30 10:58:03 +02:00
Thomas Müller
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
Thomas Müller
629faf6d34 Merge branch 'master' into appframework-master 2013-09-30 10:42:05 +02:00
Bjoern Schiessle
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
Thomas Müller
aaba0d83b5 fixing PHPDoc & typo 2013-09-30 10:03:07 +02:00
Bjoern Schiessle
b9a1f63344 go back to old template but add expire date as optional content 2013-09-30 10:02:26 +02:00
Thomas Müller
952433eae6 Merge branch 'master' into move-aborted-upload-detection-into-plugin-master 2013-09-30 09:21:37 +02:00
Thomas Müller
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
Thomas Müller
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
Evgeni Golov
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
vsapronov
1efbf7774f Fixed review issues 2013-09-29 20:16:32 -04:00
Andreas Fischer
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
Thomas Müller
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
Thomas Müller
63ea6844e8 - adding unit test testGetShareFromUnknownId() 
- fixing getShareFromId() for Oracle
- fixing error message
 2013-09-29 22:16:48 +02:00
Thomas Müller
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
Thomas Müller
5462e199d3 Merge branch 'master' into appframework-master 2013-09-29 20:07:56 +02:00
Thomas Müller
88d5e8fbca Merge pull request #5031 from zimba12/master 
followup of #4032 - makes the settings-button bigger...
 2013-09-29 09:26:47 -07:00
Alessandro Cosentino
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
Jenkins for ownCloud
59e4ff7d24 [tx-robot] updated from transifex 2013-09-29 00:03:26 -04:00
Thomas Müller
adcb738e47 initialize $middleWares 2013-09-28 20:40:25 +02:00
Thomas Müller
6979fd343b Merge branch 'master' into appframework-master 2013-09-28 20:39:19 +02:00
Morris Jobke
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
kondou
24d092c4ba Have uniform (wrong) indention 2013-09-28 17:49:07 +02:00
kondou
4907685405 Base defaultavatar text on displayname 
Fix #4876
 2013-09-28 16:46:53 +02:00
Morris Jobke
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
Thomas Tanghus
d124b6965b Implement PUT an PATCH support 2013-09-28 01:35:24 +02:00
Thomas Müller
57f37c876b delay middleware registrations 2013-09-27 17:15:26 +02:00
Thomas Müller
adff34cb8a fixing error in initialization of TagManager 2013-09-27 17:08:48 +02:00
Morris Jobke
0f5fed5409 fix license header line breaks 2013-09-27 17:02:57 +02:00
Thomas Tanghus
95cc666742 Add interface docs to IRequest. 2013-09-27 15:55:22 +02:00
Thomas Tanghus
b0d6d30705 Add patch method to OC_Route 2013-09-27 15:54:18 +02:00
Georg Ehrke
c5bcefe4db rename variable in testIsTransparent 2013-09-27 14:55:37 +02:00
Thomas Tanghus
d49e982ac8 Check if accessor matched request method. 
It's easier to find errors in the code if an exception is thrown.
 2013-09-27 14:36:19 +02:00
Thomas Müller
687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00