summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove post setup checkThomas Müller2014-09-223-30/+4
* Merge pull request #11210 from owncloud/issue/11209Morris Jobke2014-09-221-1/+20
|\
| * Also match routes without trailing slashJoas Schilling2014-09-221-1/+20
* | update 3rdparty submodule to its master commitMorris Jobke2014-09-221-0/+0
* | Merge pull request #9225 from voxsim/fix_displayNamesInGroupblizzz2014-09-222-22/+328
|\ \
| * | 1. remove sizeof($filteredUsers) > 0 as conditionvoxsim2014-09-181-2/+2
| * | add more logic in displayNamesInGroup for big user basesvoxsim2014-09-152-16/+49
| * | change logic in displayNamesInGroup and add some unit testsvoxsim2014-08-282-21/+294
| * | fix in displayNamesInGroup: when specified limit N, we did complex search onl...voxsim2014-06-261-1/+1
* | | Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizardThomas Müller2014-09-221-2/+10
|\ \ \
| * | | Append port to trusted domain in case it's not 80 or 443Lukas Reschke2014-09-081-2/+10
* | | | Merge pull request #10499 from owncloud/mkcol-headers-afterbindThomas Müller2014-09-221-1/+1
|\ \ \ \
| * | | | Use afterBind to send fileId header for files and directoriesVincent Petry2014-08-181-1/+1
* | | | | fix button text l10nVolkan Gezer2014-09-221-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2213-13/+18
* | | | | Merge pull request #11203 from owncloud/fix_broken_previews_on_public_pageMorris Jobke2014-09-211-0/+2
|\ \ \ \ \
| * | | | | files_sharing: add route for ajax/publicpreviewGeorg Ehrke2014-09-211-0/+2
* | | | | | Merge pull request #11199 from owncloud/delete_bogus_previewsMorris Jobke2014-09-212-1/+43
|\ \ \ \ \ \
| * | | | | | delete old previewsGeorg Ehrke2014-09-212-1/+43
| |/ / / / /
* | | | | | Merge pull request #11200 from owncloud/preview_better_errorhandlingMorris Jobke2014-09-211-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | make sure preview prop is instanceof OC_Image before using it in showPreviewGeorg Ehrke2014-09-211-1/+3
|/ / / / /
* | | | | Merge pull request #11196 from owncloud/sqlite-migration-smallint-masterMorris Jobke2014-09-211-0/+1
|\ \ \ \ \
| * | | | | adding 'smallint unsigned' to type mapping for sqliteThomas Müller2014-09-201-0/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2124-41/+83
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2031-97/+164
* | | | | Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the...Morris Jobke2014-09-191-7/+7
|\ \ \ \ \
| * | | | | Throw error in showPreview instead the constructorLukas Reschke2014-09-191-7/+7
* | | | | | Merge pull request #11184 from owncloud/typoMorris Jobke2014-09-191-1/+1
|\ \ \ \ \ \
| * | | | | | fix typoVolkan Gezer2014-09-191-1/+1
|/ / / / / /
* | | | | | Add myself as authorVincent Petry2014-09-191-0/+1
* | | | | | Merge pull request #10968 from owncloud/admin-groupsselect2Lukas Reschke2014-09-1968-113/+153
|\ \ \ \ \ \
| * | | | | | Add select2 cache for complete group listVincent Petry2014-09-111-23/+39
| * | | | | | fit select2 to ownCloud input styleJan-Christoph Borchardt2014-09-101-0/+12
| * | | | | | Fixed select2 for admin and apps pageVincent Petry2014-09-104-13/+29
| * | | | | | Added select2 on the apps pageVincent Petry2014-09-096-88/+99
| * | | | | | Remove excludegroup.phpVincent Petry2014-09-091-18/+0
| * | | | | | Load select2 on admin pageVincent Petry2014-09-091-0/+2
| * | | | | | Now using select2 for the groups excluded from sharingVincent Petry2014-09-093-57/+58
| * | | | | | Move select2 from files_external to coreVincent Petry2014-09-0959-2/+2
* | | | | | | Merge pull request #11104 from owncloud/enc_create_backup_on_recoveryLukas Reschke2014-09-194-1/+62
|\ \ \ \ \ \ \
| * | | | | | | make sure that we really catch the files folder onlyBjoern Schiessle2014-09-191-1/+1
| * | | | | | | create backup from all keys before recoveryBjoern Schiessle2014-09-193-0/+61
* | | | | | | | Merge pull request #11171 from owncloud/fix-routeLukas Reschke2014-09-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Match more URL fragmentsLukas Reschke2014-09-181-1/+1
* | | | | | | | | Merge pull request #11158 from owncloud/fix_basic_authLukas Reschke2014-09-192-34/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Move BasicAuth check to "isLoggedIn()"Lukas Reschke2014-09-182-34/+9
* | | | | | | | | Merge pull request #11142 from owncloud/fix-windowsLukas Reschke2014-09-191-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolves cache tests failing if the directory length is longer than 64Clark Tomlinson2014-09-171-0/+4
* | | | | | | | | | Merge pull request #11119 from owncloud/removeOldUpgradeRoutinesVincent Petry2014-09-191-20/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove old upgrade routinesLukas Reschke2014-09-161-20/+0