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

5135 commits

Author SHA1 Message Date
Morris Jobke
248eed16a6 fix defaults.php doc 2013-11-25 14:26:26 +01:00
Morris Jobke
7f47cc062c fix defaults.php doc 2013-11-25 14:13:58 +01:00
Morris Jobke
b7ddc78626 fix db.php doc 2013-11-25 14:06:25 +01: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
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
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
Andreas Fischer
b6bb2b26dd Make "Please contact your system administrator" a full sentence. 2013-11-01 11:35:02 +01:00
Morris Jobke
f5b42c63d4 Merge pull request #5653 from owncloud/fix-api-documentation 
fix documentation stuff
 2013-11-01 02:56:03 -07:00
Morris Jobke
fad2149e3f Merge pull request #5551 from owncloud/fix-5202-master 
When updating an appstore app, execute a database update
 2013-10-31 11:10:28 -07:00
Morris Jobke
0dbe90cc9a fix documentation stuff 2013-10-31 19:00:53 +01:00
Jörn Friedrich Dreyer
ae469b67a0 Merge pull request #5637 from owncloud/fix_privatedata 
Fix privatedata
 2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer
b4cdac0a60 Merge pull request #5591 from owncloud/home-storage 
Make home folders movable without requiring rescans
 2013-10-31 10:20:03 -07:00
Andreas Fischer
d6ddb12c20 Get rid of the SELECT query. Try UPDATE, on failure INSERT. 2013-10-31 16:04:18 +01:00
Thomas Müller
aae6e76926 fixing undefined index in delete() 2013-10-31 10:24:28 +01:00
Thomas Müller
64d0b0d184 PHPDoc comment updated - checkLoggedIn() removed 2013-10-31 10:21:17 +01:00
Thomas Müller
0cec17ba87 no need to check if the user is logged in 2013-10-31 10:14:06 +01:00
Thomas Müller
47da2ef8db fixing php notice: Undefined index key 2013-10-31 10:02:18 +01:00
Thomas Müller
b2929de0a7 no need to check if the user is logged in - this is already done in the ocs dispatcher itself 
adding @return
 2013-10-31 09:58:18 +01:00
Thomas Müller
64bfd21ccd Merge branch 'master' into fix_privatedata 2013-10-31 09:05:35 +01:00
Thomas Müller
3f42c890be we should check if a user is logged in before we check for admin privilege 2013-10-30 22:59:31 +01:00
Thomas Müller
261cd87efa Merge branch 'master' into home-storage 2013-10-30 22:11:19 +01:00
Lukas Reschke
c1730d241c Merge pull request #5615 from owncloud/fixing-5614-master 
http header OCS-ApiRequest: true is required in case of session based OC...
 2013-10-30 13:12:16 -07:00
Lukas Reschke
cba12e009f Added missing HTTP prefix to the $_SERVER variable 2013-10-30 21:07:19 +01:00
Frank Karlitschek
330d026be7 fix the privatedata key value store 2013-10-30 19:36:29 +01:00
Robin Appelman
c9f3f2874f Merge branch 'master' into update-parent-storage-mtime 
Conflicts:
	lib/private/files/cache/updater.php
 2013-10-30 13:41:10 +01:00
Vincent Petry
de342a5ac7 Merge pull request #5603 from owncloud/fix_file_cache_updater_master 
Fix file cache updater (backport to master of #5513)
 2013-10-30 02:31:08 -07:00
Thomas Müller
3d42e402c5 http header OCS-ApiRequest: true is required in case of session based OCS API calls 2013-10-29 23:07:27 +01:00
Bjoern Schiessle
e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Björn Schießle
e08f38f99b Merge pull request #5605 from owncloud/fix_delete_user 
remove user from cache if he was deleted successfully
 2013-10-29 09:46:21 -07:00
Thomas Müller
e0bc89c87f Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath 
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
 2013-10-29 09:29:29 -07:00
Bjoern Schiessle
0d7d396d80 make sure that also the storage etag gets changed 2013-10-29 16:30:47 +01:00
Bjoern Schiessle
f021dad204 remove user from cache if he was deleted successfully 2013-10-29 15:50:33 +01:00
Morris Jobke
34c1512466 Merge pull request #5601 from owncloud/fix-mimetype-detection 
Fix mimetype detection
 2013-10-29 07:47:20 -07:00
Morris Jobke
7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code 
Fix sharing error message - id -> file name
 2013-10-29 07:33:23 -07:00
Bjoern Schiessle
a80ac9c492 make getUidAndFilename() private 2013-10-29 15:10:02 +01:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Robin Appelman
b3626f34cd Update the parent folders storage_mtime on write and delete to prevent rescans 2013-10-29 14:18:57 +01:00
Andreas Fischer
b3e39dd3d9 Map empty mimetypes to octet-stream for Oracle DBMS. 2013-10-29 14:18:42 +01:00
Andreas Fischer
fa6ae81149 Return early if fileinfo is there. 2013-10-29 13:48:30 +01:00
Andreas Fischer
68d13210bd Reset mimetype to application/octet-stream on empty reply from file command. 2013-10-29 13:29:35 +01:00
Robin Appelman
0e92a4896d dont use the home storage for non-existing users 2013-10-29 13:12:28 +01:00
Andreas Fischer
a04a01d51f Do not calculate $isWrapped if not needed. 2013-10-29 12:54:30 +01:00
Jenkins for ownCloud
b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00