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

9018 commits

Author SHA1 Message Date
Morris Jobke
f6807337a8 Add @since tag to public namespace constants 2015-04-18 23:19:35 +02:00
Joas Schilling
3f3f8c2f99 Fix usage of deprecated private constants 2015-04-18 10:30:02 +02:00
Joas Schilling
6ce1abfa5c Deprecate the OC_API constants in favor of the OCP ones 2015-04-18 09:29:52 +02:00
Joas Schilling
4e58f4892a Move constants to OCP\API so apps can use them 2015-04-18 09:29:51 +02:00
Joas Schilling
5acda185bd Correctly prefix OC_API with \ since its not in the namespace 2015-04-18 09:12:42 +02:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Morris Jobke
7ab1f807fb Merge pull request #15691 from owncloud/vobject-sabre2.1 
Get rid of the obsolete OC_VObject class
 2015-04-17 22:33:00 +02:00
Thomas Müller
d9990c2b4e Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager' 2015-04-17 13:55:31 +02:00
Vincent Petry
b7e5884b54 Get rid of the obsolete OC_VObject class 
The class isn't needed any more since the update to Sabre 2.1
 2015-04-17 12:55:31 +02:00
Bjoern Schiessle
7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Thomas Müller
f32d97750c Merge pull request #15679 from owncloud/fix-private-member-access 
Fix private member access of parent class in ocsresponse
 2015-04-17 09:13:54 +02:00
Thomas Müller
852cc6f2c6 Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace 
Add @since tags to all methods in public namespace
 2015-04-17 09:13:04 +02:00
Jenkins for ownCloud
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Morris Jobke
7644950b48 Add @since tags to all methods in public namespace 
* enhance the app development experience - you can look up the
  method introduction right inside the code without searching
  via git blame
* easier to write apps for multiple versions
 2015-04-16 17:00:08 +02:00
Morris Jobke
1d30efdd73 Fix private member access of parent class in ocsresponse 
* noticed while checking PHPDoc
 2015-04-16 16:54:01 +02:00
Clark Tomlinson
1174ad0681 Merge pull request #15445 from owncloud/enc2_migration 
add migration script from old encryption to new one
 2015-04-16 09:34:47 -04:00
Joas Schilling
c7e5e30b86 Merge pull request #15674 from owncloud/fix-console-check-output 
Convert error and hint to string before writing to the output
 2015-04-16 14:51:29 +02:00
Bjoern Schiessle
b25c06f576 detect system wide mount points correctly 2015-04-16 14:15:04 +02:00
Bjoern Schiessle
67500d5f2f if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size 2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Thomas Müller
07243f0482 Convert error and hint to string before writing to the output - fixes https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html 2015-04-16 12:32:17 +02:00
Thomas Müller
bcf65d9c13 Using TRANSACTION_READ_COMMITTED 2015-04-16 11:49:12 +02:00
Jörn Friedrich Dreyer
2e06cf49a5 Merge pull request #15623 from t3chguy/master 
Redis DB Index via Select
 2015-04-16 09:30:07 +02:00
Jenkins for ownCloud
8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Michael Telatynski
8ebf9de3f8 Memcache\Redis Add DB Select Functionality 2015-04-15 21:24:38 +01:00
Morris Jobke
e33e5b425a Merge pull request #12006 from owncloud/dav-put-storage 
Work directly on the storage when uploading over webdav
 2015-04-15 03:08:52 +02:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Thomas Müller
70480423ff Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath 
Adding a final fallback for findBinaryPath
 2015-04-15 00:16:56 +02:00
Thomas Müller
1aa368effe Merge pull request #15592 from owncloud/fix-15590-master 
Avoid php message "Invalid argument supplied for foreach()"
 2015-04-15 00:14:08 +02:00
Björn Schießle
4f0437fbde Merge pull request #15598 from owncloud/fix-enc-file-size-master 
Fix file size of encrypted files
 2015-04-14 16:48:04 +02:00
Robin Appelman
eeecca04e6 Keep phpdoc updated. 2015-04-14 16:25:52 +02:00
Robin Appelman
308af8b909 pass a stream to the tests 2015-04-14 15:25:52 +02:00
Morris Jobke
82cab25762 Merge pull request #13360 from owncloud/cross-storage-move 
Proper copy/move between multiple local storages
 2015-04-14 14:35:08 +02:00
Olivier Paroz
bb0c09e994 Adding a final fallback for findBinaryPath 2015-04-14 14:06:58 +02:00
Thomas Müller
cbe30f740e remove calculateUnencryptedSize() - not needed 2015-04-14 13:08:59 +02:00
Thomas Müller
967e882757 return size from cache in case the cache entry is marked as encrypted 2015-04-14 13:08:59 +02:00
Thomas Müller
387984a0d5 preserve filesize on rename after upload 2015-04-14 12:27:12 +02:00
Thomas Müller
88cc52c408 Avoid php message "Invalid argument supplied for foreach()" - refs #15590 2015-04-14 11:00:20 +02:00
Morris Jobke
5f66f867b6 Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace 
Fix namespace duplication and other issues in repairlegacystorages
 2015-04-13 21:51:38 +02:00
Morris Jobke
9eff199a17 Merge pull request #15360 from owncloud/cross-storage-move-cache 
Preserve cache data when doing a cross storage move
 2015-04-13 21:48:30 +02:00
Robin Appelman
f605c98531 Fix cross storage move with shared storages 2015-04-13 17:10:05 +02:00
Robin Appelman
addfafd9da Fix moving mount points 2015-04-13 17:10:02 +02:00
Robin Appelman
caadc8cdd9 reuse cache move logic 2015-04-13 17:10:01 +02:00
Robin Appelman
d7b3a1a35a preserve cache data when doing a cross storage move 2015-04-13 17:10:01 +02:00
Joas Schilling
71de1d58cd Fix namespace duplication and other issues in repairlegacystorages 2015-04-13 16:34:10 +02:00
Thomas Müller
660aa7ff1e Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results 
cach user folder for file search results
 2015-04-13 15:16:07 +02:00
Robin Appelman
c29419e6d7 fix rebase issue 2015-04-13 15:13:03 +02:00
Robin Appelman
0772e3b4c1 Properly handle copy/move failures in cross storage copy/move 2015-04-13 15:13:03 +02:00
Robin Appelman
404773940d Detect storage full when doing cross storage copy/move 2015-04-13 15:13:03 +02:00
Robin Appelman
d26c6cab90 properly return false if we cant delete the source file 2015-04-13 15:13:03 +02:00