You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php		13 years ago
..
MDB2/Driver	Fix strict standards warnings	13 years ago
archive	fix creating nested folders inside tar files	13 years ago
backgroundjob	Backgroundjobs: Fix wrong var names	13 years ago
cache	add prefix option to OC_Cache::clear	13 years ago
connector/sabre	Merge branch 'chunked_upload'	13 years ago
filecache	fix scanning of archives in some cases	13 years ago
fileproxy	Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache	13 years ago
filestorage	Merge branch 'share_api'	13 years ago
group	Merge branch 'master' into share_api	13 years ago
l10n	[tx-robot] updated from transifex	13 years ago
log	Move line counter so we only count lines towards the offset that are equal or above the log level	13 years ago
migration	Typo fix (breif->brief)	13 years ago
minimizer	remove trailing slash in %appswebroot% placeholder	13 years ago
public	Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.	13 years ago
search	remove unused variables	13 years ago
user	Make getting all users and groups the default	13 years ago
app.php	Small changes to allow updating main menu dynamically.	13 years ago
appconfig.php	update copyright	13 years ago
archive.php	add OC_Archive::addRecursive	13 years ago
base.php	Revert "Combine install checks in lib/base.php"	13 years ago
cache.php	add option to only get fast cache	13 years ago
config.php	Do not close php tag on config file	13 years ago
db.php	fix spelling fail	13 years ago
eventsource.php	CSRF protection for eventsource	13 years ago
filecache.php	Merge branch 'master' into share_api	13 years ago
filechunking.php	Chunked upload: Support reusing local chunks	13 years ago
fileproxy.php	Smarter code for OC_FileProxy	13 years ago
files.php	Merge branch 'share_api'	13 years ago
filestorage.php	Merge branch 'share_api'	13 years ago
filesystem.php	Merge branch 'share_api'	13 years ago
filesystemview.php	Merge branch 'share_api'	13 years ago
geo.php	add OC_Geo class	13 years ago
group.php	Add search, limit, offset parameters to usersInGroups()	13 years ago
helper.php	Move serverHost and serverProtocol functions to OC_Request	13 years ago
hook.php	allow clearing hooks and fileproxies	13 years ago
image.php	some indention fixes	13 years ago
installer.php	Small changes to allow updating main menu dynamically.	13 years ago
json.php	Merge branch 'master' into subadmin	13 years ago
l10n.php	add warning in log if OC_L10N::tA was called	13 years ago
log.php	The log message is not always shown in html	13 years ago
mail.php	Add additional error handling for emailing private links	13 years ago
migrate.php	Also check for some other files	13 years ago
mimetypes.list.php	add impress mimetype	13 years ago
minimizer.php	Fix oc-1163: gzdecode function not always defined	13 years ago
ocs.php	add the calls for the new keyserver. Still not connectect to the encryption system	13 years ago
ocsclient.php	fix unused variables	13 years ago
preferences.php	fix unused variables	13 years ago
request.php	Decode the alternative path_info	13 years ago
response.php	ETags must be quoted.	13 years ago
search.php	update copyright	13 years ago
setup.php	fix unused variables	13 years ago
streamwrappers.php	fix unused variables	13 years ago
subadmin.php	add some hooks for subadmins	13 years ago
template.php	fix unused variables	13 years ago
templatelayout.php	fix unused variables	13 years ago
updater.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	13 years ago
user.php	Change limit parameter in OC_User as well	13 years ago
util.php	bump version to reate new tables	13 years ago
vcategories.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	13 years ago
vobject.php	replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime	13 years ago