Commit Graph

1613 Commits

Author SHA1 Message Date
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
Robin Appelman 1522f7f211 fix some minor problems with path noramlization 2012-08-14 03:07:14 +02:00
Robin Appelman 0c8ce0bb32 some basic path normalization 2012-08-14 02:44:45 +02:00
Michael Gapczynski 863d3a43b2 Catch exceptions and write to log when creating storage object fails 2012-08-13 17:10:58 -04:00
Lukas Reschke e72a57f595 Also check for some other files 2012-08-13 00:57:01 +02:00
Michael Gapczynski 64ef1e2181 Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor... 2012-08-12 14:49:41 -04:00
Jakob Sack 4d3d4522f9 Backgroundjobs: Fix wrong var names 2012-08-12 12:14:27 +02:00
Jakob Sack deef1f73db Backgroundjobs: fix bug in QueuedTask 2012-08-12 09:02:20 +02:00
Michael Gapczynski a1c88a3e39 Add search, limit, offset parameters to usersInGroups() 2012-08-11 16:25:28 -04:00
Michael Gapczynski 4f1b3631ba Change limit parameter in OC_User as well 2012-08-11 16:25:28 -04:00
Michael Gapczynski 874f31b8d7 Make getting all users and groups the default 2012-08-11 16:25:27 -04:00
Michael Gapczynski 8d1eb674ec Add search, limit, and offset parameters to getUsers() and getGroups() 2012-08-11 16:25:27 -04:00
Jakob Sack 1d7e3071e0 bump version to reate new tables 2012-08-11 17:32:17 +02:00
Lukas Reschke 0d8df3f55c Revert "Combine install checks in lib/base.php"
This reverts commit aa9fbf6639.
2012-08-11 17:07:35 +02:00
Michael Gapczynski 465767670b Check blacklist when renaming files 2012-08-11 11:04:04 -04:00
Lukas Reschke 8ec45870a3 Validate cookie properly and prevent auth bypass
BIG (!) thanks to Julien CAYSSOL
2012-08-10 15:28:59 +02:00
Jakob Sack 0ea4fa298c Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed 2012-08-10 13:53:40 +02:00
Jakob Sack 81b997b56e Merge branch 'backgroundjobs' 2012-08-10 13:00:51 +02:00
Bart Visscher 82b10954e7 Simplify loading app php script files 2012-08-10 12:27:37 +02:00
Bart Visscher 5e7086adc9 Move login handling to OC class 2012-08-10 12:17:13 +02:00
Bart Visscher 83403784d1 Always load when the requested file is css 2012-08-10 11:43:04 +02:00
Bart Visscher da07245f59 Move OC::loadfile and OC::loadapp next to OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher e3c732040b Make OC::loadfile and OC::loadapp protected, only used in OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher 0973969386 Cleanup OC::loadfile 2012-08-10 11:43:04 +02:00
Bart Visscher 667cd318fe Use OC_Util::displayLoginPage and cleanup the function 2012-08-10 11:43:04 +02:00
Bart Visscher aa9fbf6639 Combine install checks in lib/base.php 2012-08-10 11:43:04 +02:00
Jakob Sack f46fdfd814 Backgroundjobs: Add reset counter in worker 2012-08-09 22:30:11 +02:00
Jakob Sack a6a1f892f0 BackgroundJobs: fix bug 2012-08-09 22:07:18 +02:00
Michael Gapczynski be03ee29f0 Bump up version number 2012-08-09 13:55:36 -04:00
Jakob Sack 28c1ec19ea BackgroundJob: forgot to rename file 2012-08-09 19:26:49 +02:00
Jakob Sack ceda0ae052 Backgroundjobs: rename ScheduledTask to QueuedTask 2012-08-09 19:04:04 +02:00
Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
Robin Appelman acd8381094 fix scanning of archives in some cases 2012-08-09 16:36:16 +02:00
Georg Ehrke 10d0861872 remove unstable lib 2012-08-09 12:37:26 +02:00
Jakob Sack 889f0a1c6d rename appconfig keys for backgroundjobs 2012-08-09 10:40:39 +02:00
Michael Gapczynski b830b3e24b Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Michael Gapczynski 2c5744f16c Add back getItemSharedWithBySource(), some situtations require this ability 2012-08-08 20:56:55 -04:00
Jakob Sack 37ee88aa6d Fixed bug in OC_BackgroundJob_Worker 2012-08-09 01:29:15 +02:00
Jakob Sack 13a0818fec Be more precise regarding backgroundjobs mode 2012-08-09 01:02:05 +02:00
Jakob Sack 4107273a79 fix license text 2012-08-09 00:46:50 +02:00
Jakob Sack 088b3ea0bc Add public interface to background jobs 2012-08-09 00:01:06 +02:00
Jakob Sack 443e198224 Renaming backgroundjobs on file system as well 2012-08-09 00:00:12 +02:00
Jakob Sack 6025d2ebc3 Rename Backgroundjobs to BackgroundJob 2012-08-08 23:59:30 +02:00
Jakob Sack 4f90860001 Add initial version of backgroundjobs library 2012-08-08 23:39:30 +02:00
Bart Visscher 3387454094 Move login code from index.php to OC class 2012-08-08 22:42:51 +02:00
Bart Visscher 9156fb73fd Move handling request of index.php to OC class 2012-08-08 22:42:50 +02:00
Bart Visscher 7522a23693 Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
Bjoern Schiessle 0bf2a3e6d6 while loop not needed because of recursive call of put() 2012-08-08 11:29:44 +02:00
Bjoern Schiessle dc927bd346 fix for bug 879 - add parent directory to file cache if it does not exist yet.
This can happen if the sync client is used before user created the root directory (e.g. through web login) for example.
2012-08-08 10:51:19 +02:00
Bart Visscher b287b11ff2 adjust the query generation in getItems, to use placeholders 2012-08-07 21:49:31 +02:00