summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #5607 from owncloud/public-share-styleJan-Christoph Borchardt2013-10-291-15/+13
|\ \ \ \ \ \ \
| * | | | | | | fix style of public share pageMorris Jobke2013-10-291-15/+13
|/ / / / / / /
* | | | | | | 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-294-35/+64
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | also add new parameter to function callsMorris Jobke2013-10-291-4/+4
| * | | | | | pass the name of the item source from the browser to the server - no need to ...Thomas Müller2013-10-234-32/+43
| * | | | | | Merge branch 'master' into fix-sharing-codeThomas Müller2013-10-23472-4920/+11290
| |\ \ \ \ \ \
| * | | | | | | Fix sharing error message - id -> file nameMorris Jobke2013-10-171-11/+29
| | | | | | * | update touch tests for updated behaviourRobin Appelman2013-10-291-2/+0
| | | | | | * | Update the parent folders storage_mtime on write and delete to prevent rescansRobin Appelman2013-10-292-1/+53
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-29502-1659/+2294
* | | | | | | Merge pull request #5493 from owncloud/fix-language-detectionThomas Müller2013-10-282-21/+66
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into fix-language-detectionThomas Müller2013-10-2465-1071/+4021
| |\ \ \ \ \ \
| * | | | | | | fixing PHPDoc & grammarThomas Müller2013-10-231-5/+5
| * | | | | | | Some tests for OC_L10N::findLanguage()Andreas Fischer2013-10-231-0/+41
| * | | | | | | 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 #5587 from owncloud/trashbin-homecrumbJulian Müller2013-10-281-5/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fixed clicking on the "Home" breadcrumb in the trash appVincent Petry2013-10-281-5/+0
|/ / / / / / /
* | | | | | | 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-27246-1273/+1092
* | | | | | | | | Merge pull request #5566 from owncloud/fix-double-notLukas Reschke2013-10-272-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix double not in newfile/newfolder language.Andreas Fischer2013-10-272-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5552 from owncloud/admin-warninghomeexistsfixThomas Müller2013-10-271-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed user dir existence check when creating new userVincent Petry2013-10-251-4/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #5537 from owncloud/autotest-syntaxhelpThomas Müller2013-10-271-4/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added syntax help for autotest.shVincent Petry2013-10-251-4/+30
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-27774-25383/+43641
* | | | | | | | | | Merge pull request #5561 from owncloud/fix5401Thomas Müller2013-10-261-14/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | local user backend shall search for both username and displayname, fixes #5401Arthur Schiwon2013-10-251-14/+3
* | | | | | | | | | | Merge pull request #5562 from owncloud/fix5560Thomas Müller2013-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix broken users page when a username consists of digits only, fixes #5560Arthur Schiwon2013-10-251-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5542 from owncloud/quotastream-fseektoendfixBjörn Schießle2013-10-254-3/+109
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-252-1/+23
| * | | | | | | | | | Fixed quota stream's fseek methodVincent Petry2013-10-252-2/+84
| |/ / / / / / / / /
* | / / / / / / / / Port PR #5457 to masterArthur Schiwon2013-10-251-4/+11
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | make sure the shared ldap connection is rebound to the configured user after ...Donald Buczek2013-10-251-1/+3
|/ / / / / / / /