Commit Graph

15122 Commits

Author SHA1 Message Date
Vincent Petry e3868ba118 Fixed watcher to also update the owner's folder sizes
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
Andreas Fischer d428b0d980 Merge pull request #5696 from owncloud/fixing-5670-master
decode arguments as array

* owncloud/fixing-5670-master:
  decode arguments as array
2013-11-05 13:32:27 +01:00
Thomas Müller a438abe2fe Merge pull request #5699 from owncloud/fixing-4606-master
calling getstoragestats.php only if a user is logged in because this cal...
2013-11-05 04:30:35 -08:00
Arthur Schiwon fc040755c1 LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed 2013-11-05 13:19:32 +01:00
Thomas Müller ad336c94dc Merge pull request #5695 from owncloud/fixing-dropbox-master
fixing dropbox require path
2013-11-05 04:15:20 -08:00
Thomas Müller b869fb2a09 calling getstoragestats.php only if a user is logged in because this call requires a user to be logged in 2013-11-05 12:18:25 +01:00
miicha ef1183bf86 allows agent and password or neither agent nor password
this contribution is MIT licensed
2013-11-05 11:51:53 +01:00
Thomas Müller b75c724cc4 fixing dropbox require path 2013-11-05 10:33:21 +01:00
Thomas Müller 08c8bf5a7b decode arguments as array 2013-11-05 10:30:18 +01:00
Thomas Müller 3488202f67 Merge pull request #5582 from owncloud/files-previewcaching
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Thomas Müller f91fe8d595 Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
Oc6 windows server mssql master
2013-11-05 00:41:11 -08:00
Thomas Müller d48ba5a5bf Merge pull request #5540 from owncloud/scanner-enhancments-master
Scanner enhancments master
2013-11-04 23:58:42 -08:00
miicha 5b9bdaadaa allow empty user-dn and password
help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings...
2013-11-05 01:24:20 +01:00
Thomas Müller 01f2b7eb3a move to oc6 documentation 2013-11-04 22:50:12 +01:00
Andreas Fischer 8274d9f91c Inherit lastInsertId() from Adapter. 2013-11-04 22:28:41 +01:00
Thomas Müller 4f24d4ba01 display the exception instead of meaningless message 2013-11-04 21:55:55 +01:00
Thomas Müller a7cb16aab1 use === 2013-11-04 21:23:10 +01:00
Thomas Müller b767bbcdda Merge pull request #5683 from owncloud/no-coverage-with-php-v53-master
adding environment variable to control coverage reporting
2013-11-04 10:24:40 -08:00
Thomas Müller 4025f39324 keep junit xml reports 2013-11-04 17:25:07 +01:00
Thomas Mueller 665b7571f4 adding test for binary file to test \OC_Helper::streamCopy() 2013-11-04 17:19:04 +01:00
Thomas Mueller 2e6f339886 ignore test files 2013-11-04 17:17:32 +01:00
Thomas Müller 99933b2ca3 adding environment variable to control coverage reporting 2013-11-04 17:04:54 +01:00
Arthur Schiwon 3d6030b2ae LDAP: improve design and placement of Save button 2013-11-04 16:54:48 +01:00
Arthur Schiwon 17820fbef6 LDAP: make buttons on Expert page work again, fixes #5585 2013-11-04 16:48:40 +01:00
Thomas Müller c3898061a8 Merge pull request #5544 from owncloud/fixing-3593-2-master
Add FileId header and switch fileid and instance id
2013-11-04 04:30:12 -08:00
Thomas Müller 0f266d0f62 set log level to DEBUG 2013-11-04 12:58:30 +01:00
Andreas Fischer 26ecf2062c Merge pull request #5656 from owncloud/fix-wizard-typo
Fix typo in LDAP wizard

* owncloud/fix-wizard-typo:
  Excpetion->Exception
2013-11-04 09:39:19 +01:00
Jenkins for ownCloud e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud 07e540613e [tx-robot] updated from transifex 2013-11-03 12:44:12 -05:00
Thomas Müller 7125bfba21 Merge pull request #5678 from owncloud/fix-api-documentation
Fix api documentation
2013-11-03 06:38:44 -08:00
Morris Jobke ba2dd3b37c Merge pull request #5671 from owncloud/fixing-5668-master
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-03 05:08:56 -08:00
Morris Jobke ef592981ea unify license headers for public API files 2013-11-03 13:51:39 +01:00
Morris Jobke d2a48d58ce fix "No page-level DocBlock" 2013-11-03 13:38:25 +01:00
Morris Jobke 2dcaa4ddbf Merge pull request #4961 from owncloud/unshare-over-delete
Use OCP\Share::unshare() instead of directly using OCP\Share::delete()
2013-11-03 04:07:42 -08:00
Andreas Fischer 7c1f0da0fe Always select item_source. 2013-11-03 12:34:40 +01:00
Andreas Fischer fa56aec4b8 Deduplicate expiration date check into a method. 2013-11-03 12:34:38 +01:00
Andreas Fischer 779b87d46a Use unshareItem() when unsharing expired shares. 2013-11-03 12:33:34 +01:00
Andreas Fischer ebf1694795 Use unshareItem() in unshareAll(). 2013-11-03 12:33:34 +01:00
Andreas Fischer 1d1f5b288e Extract unshare() code into unshareItem(). 2013-11-03 12:33:34 +01:00
Andreas Fischer 329299e34c OCP\Share::unshareAll(): Deduplicate hook parameters. 2013-11-03 12:33:31 +01:00
Andreas Fischer 8872b881cc Add tests for OCP\Share::unshareAll(). 2013-11-03 12:31:53 +01:00
VicDeo a937272379 Merge pull request #5672 from owncloud/fixing-5668-master-2
fixing Specified key was too long; max key length is 767 bytes
2013-11-03 01:21:18 -07:00
Thomas Mueller f22684cb3d fixing Specified key was too long; max key length is 767 bytes 2013-11-02 20:52:38 +01:00
Thomas Mueller 998211f7a3 WIN: fixing unit test for testStreamCopy() 2013-11-02 20:31:29 +01:00
Thomas Mueller e37047b2a0 WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311 2013-11-02 20:22:12 +01:00
Thomas Mueller 5ecebe211b mssql: fixing lastInsertId() implementation 2013-11-02 20:21:19 +01:00
Thomas Mueller eb3c5070c0 replace template function link_to_docs() with \OC_Helper::linkToDocs() 2013-11-02 19:11:46 +01:00
Thomas Müller d25c8b43e6 Merge pull request #5652 from owncloud/front-port-5647-master
[WIP] extend unit test to directories starting or ending in whitespace
2013-11-01 23:11:33 -07:00
Bart Visscher 06b42f9788 Merge pull request #5443 from owncloud/fix-autoloader-caching
Remove Autoloader Cache Hack. Do not use Cache on Install.
2013-11-01 05:35:34 -07:00
Morris Jobke eb0ecaa13c Merge pull request #5658 from owncloud/session-error-full-sentence
[Trivial] Make "Please contact your system administrator" a full sentence.
2013-11-01 05:08:19 -07:00