Commit Graph

5157 Commits

Author SHA1 Message Date
Vincent Petry 013444813e Now removing stray old cookies from 5.0.12
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't
there,
thus making it impossible to logout correctly.

This fix adds extra code to delete such stray cookies.

Ported from stable5 branch 99e5c6f7eb
2013-11-07 18:49:50 +01:00
Jenkins for ownCloud 263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
blizzz 7c89309e26 Merge pull request #5691 from owncloud/switch-to-oc6-documentation
move to oc6 documentation
2013-11-05 08:22:26 -08: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
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 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
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
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
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
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