summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into update-parent-storage-mtimeRobin Appelman2013-10-307-51/+121
|\
| * Merge pull request #5603 from owncloud/fix_file_cache_updater_masterVincent Petry2013-10-301-12/+39
| |\
| | * Merge branch 'master' into fix_file_cache_updater_masterBjoern Schiessle2013-10-296-39/+82
| | |\
| | * | make sure that also the storage etag gets changedBjoern Schiessle2013-10-291-4/+7
| | * | make getUidAndFilename() privateBjoern Schiessle2013-10-291-1/+1
| | * | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-291-12/+36
| * | | use getHome() to delete users dataBjoern Schiessle2013-10-291-3/+3
| | |/ | |/|
| * | Merge pull request #5605 from owncloud/fix_delete_userBjörn Schießle2013-10-292-9/+30
| |\ \
| | * | remove user from cache if he was deleted successfullyBjoern Schiessle2013-10-292-9/+30
| | |/
| * | Merge pull request #5577 from owncloud/fix_urlgenerator_imagepathThomas Müller2013-10-291-5/+5
| |\ \
| | * | use SERVERROOT instead of WEBROOT in all file_exists checks, whitespaceJörn Friedrich Dreyer2013-10-281-5/+5
| * | | Merge pull request #5601 from owncloud/fix-mimetype-detectionMorris Jobke2013-10-292-2/+10
| |\ \ \
| | * | | Map empty mimetypes to octet-stream for Oracle DBMS.Andreas Fischer2013-10-291-0/+4
| | * | | Return early if fileinfo is there.Andreas Fischer2013-10-291-0/+1
| | * | | Reset mimetype to application/octet-stream on empty reply from file command.Andreas Fischer2013-10-291-0/+4
| | * | | Do not calculate $isWrapped if not needed.Andreas Fischer2013-10-291-2/+1
| | | |/ | | |/|
| * | | Merge pull request #5396 from owncloud/fix-sharing-codeMorris Jobke2013-10-291-23/+37
| |\ \ \ | | |/ / | |/| |
| | * | pass the name of the item source from the browser to the server - no need to ...Thomas Müller2013-10-231-24/+20
| | * | Merge branch 'master' into fix-sharing-codeThomas Müller2013-10-2364-80/+578
| | |\ \
| | * | | Fix sharing error message - id -> file nameMorris Jobke2013-10-171-11/+29
* | | | | Update the parent folders storage_mtime on write and delete to prevent rescansRobin Appelman2013-10-291-1/+21
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-291-0/+1
* | | | Merge pull request #5493 from owncloud/fix-language-detectionThomas Müller2013-10-281-21/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into fix-language-detectionThomas Müller2013-10-2414-26/+328
| |\ \ \
| * | | | fixing PHPDoc & grammarThomas Müller2013-10-231-5/+5
| * | | | Have to also strtolower() on available language name. Otherwise no match.Andreas Fischer2013-10-231-4/+6
| * | | | Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching.Andreas Fischer2013-10-231-0/+4
| * | | | Apply substring on the correct value.Andreas Fischer2013-10-231-1/+1
| * | | | Better variable names.Andreas Fischer2013-10-231-9/+9
| * | | | Fix coding style for else.Andreas Fischer2013-10-231-4/+2
| * | | | Correct indentation for default language.Andreas Fischer2013-10-231-4/+4
* | | | | Merge pull request #5550 from owncloud/fix-4716-masterMorris Jobke2013-10-281-3/+3
|\ \ \ \ \
| * | | | | update documentation for app updateMorris Jobke2013-10-281-1/+1
| * | | | | 'Update to' is shown when there is no updateBart Visscher2013-10-251-2/+2
* | | | | | Merge pull request #3889 from owncloud/apps_preloadMorris Jobke2013-10-281-1/+1
|\ \ \ \ \ \
| * | | | | | Don't load the apps when we need to upgradeBart Visscher2013-06-281-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-271-0/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-276-4/+25
* | | | | | | local user backend shall search for both username and displayname, fixes #5401Arthur Schiwon2013-10-251-14/+3
* | | | | | | Added comment for clarification about fseek() call in quota.phpVincent Petry2013-10-251-0/+2
* | | | | | | Fixed quota stream to not wrap read-only fopen callsVincent Petry2013-10-251-1/+1
* | | | | | | Fixed quota stream's fseek methodVincent Petry2013-10-251-2/+12
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #5528 from frisco82/changeUpadateNotificationThomas Müller2013-10-241-2/+4
|\ \ \ \ \ \
| * | | | | | Changed update message to be more instructive, changed update style to be les...Ramiro Aparicio2013-10-241-2/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindexThomas Müller2013-10-241-1/+5
|\ \ \ \ \ \
| * | | | | | Remove WebDAV redirect from the root pathVincent Petry2013-10-241-1/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5494 from owncloud/fixing-3593-masterThomas Müller2013-10-242-1/+95
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | - fixing namespaceThomas Müller2013-10-241-2/+4
| * | | | | handle case where fileid is not setThomas Müller2013-10-232-4/+12
| * | | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}idThomas Müller2013-10-232-1/+85
| |/ / / /