summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5493 from owncloud/fix-language-detectionThomas Müller2013-10-282-21/+66
|\ | | | | Fix HTTP language detection
| * 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 app
| * | | Fixed clicking on the "Home" breadcrumb in the trash appVincent Petry2013-10-281-5/+0
|/ / / | | | | | | | | | | | | Clicking on the "home" breadcrumb now correctly brings the user back to the files app.
* | | Merge pull request #5550 from owncloud/fix-4716-masterMorris Jobke2013-10-281-3/+3
|\ \ \ | | | | | | | | 'Update to' is shown when there is no update
| * | | update documentation for app updateMorris Jobke2013-10-281-1/+1
| | | |
| * | | 'Update to' is shown when there is no updateBart Visscher2013-10-251-2/+2
| | | | | | | | | | | | | | | | See #4716
* | | | Merge pull request #3889 from owncloud/apps_preloadMorris Jobke2013-10-281-1/+1
|\ \ \ \ | | | | | | | | | | Don't load the apps when we need to upgrade
| * | | | Don't load the apps when we need to upgradeBart Visscher2013-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | The loading can call functions that require new tables, like oc_jobs
* | | | | [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.
| * | | | | 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 user
| * | | | | Fixed user dir existence check when creating new userVincent Petry2013-10-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check was done too later. It turns out that createUser() had already created the dir, which caused the warning message to be shown every time.
* | | | | | Merge pull request #5537 from owncloud/autotest-syntaxhelpThomas Müller2013-10-271-4/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added syntax help for autotest.sh
| * | | | | | Added syntax help for autotest.shVincent Petry2013-10-251-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autotest.sh now checks for the validity of the db config name argument. If the db config name is not known, it show syntax info. This should save some time to people to understand how to use this script. Before this fix, an invalid argument would return a big HTML page in the output.
* | | | | | | [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...
| * | | | | | | 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 #55...
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes for quota stream fseek
| * | | | | | | 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
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing return statement - Added missing support for SEEK_END - Fixes #5524
* | / / / / / 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
|/ / / / / | | | | | | | | | | | | | | | being used for password checking.
* | | | | Merge pull request #5532 from owncloud/ldap_fixesThomas Müller2013-10-243-12/+45
|\ \ \ \ \ | |_|_|_|/ |/| | | | Ldap fixes
| * | | | LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518Arthur Schiwon2013-10-241-0/+15
| | | | |
| * | | | LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520Arthur Schiwon2013-10-241-10/+28
| | | | |
| * | | | LDAP: when multiline values are passed as array, do not try to preg_split ↵Arthur Schiwon2013-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | them. Fixes #5521
| * | | | typo, fixes #5517Arthur Schiwon2013-10-241-1/+1
| | | | |
* | | | | Merge pull request #5528 from frisco82/changeUpadateNotificationThomas Müller2013-10-244-2/+17
|\ \ \ \ \ | | | | | | | | | | | | Changed update message to be more instructive
| * | | | | Changed update message to be more instructive, changed update style to be ↵Ramiro Aparicio2013-10-244-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less aggresive Fix br tags Improve english messages
* | | | | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindexThomas Müller2013-10-242-31/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove WebDAV redirect from the root path
| * | | | | | Removed old webdav endpointVincent Petry2013-10-241-30/+0
| | | | | | |
| * | | | | | Remove WebDAV redirect from the root pathVincent Petry2013-10-241-1/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent people mounting the root path. They should use the full webdav path instead. Fixes #4923
* | | | | | Merge pull request #5494 from owncloud/fixing-3593-masterThomas Müller2013-10-243-1/+96
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
| * | | | | - fixing namespaceThomas Müller2013-10-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | - remove property only if present
| * | | | | 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-233-1/+86
| |/ / / /
* | | | | Merge pull request #5512 from owncloud/css-fixleftcontentrightcontentVincent Petry2013-10-242-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | | Fix leftcontent/right content, fixes contacts app