summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21201 from mmattel/scanFiles_stat_output_IIThomas Müller2015-12-171-6/+184
|\
| * Statistics output for ./occ files:scanmartin.mattel@diemattels.at2015-12-151-6/+184
* | Merge pull request #21240 from owncloud/avatar_speedupThomas Müller2015-12-175-45/+116
|\ \
| * | [Avatar] Make the avatar controller use the avatar nodeRoeland Jago Douma2015-12-162-26/+40
| * | [Avatars] Add function to get the Node of the avatarRoeland Jago Douma2015-12-163-19/+76
* | | Merge pull request #21253 from owncloud/deprecated_oc_helper_linkToThomas Müller2015-12-177-70/+9
|\ \ \
| * | | Remove deprecated OC_Helper::linkTo functionRoeland Jago Douma2015-12-172-61/+0
| * | | OC_Helper::linkTo is deprecatedRoeland Jago Douma2015-12-176-9/+9
* | | | Merge pull request #21244 from owncloud/remove-unavailable-setting-from-sampl...Thomas Müller2015-12-171-16/+0
|\ \ \ \
| * | | | enforce_home_folder_naming_rule cannot be configured in config.phpblizzz2015-12-161-16/+0
| |/ / /
* | | | Merge pull request #21241 from owncloud/fix_21226Thomas Müller2015-12-171-1/+7
|\ \ \ \
| * | | | Do not try to get the avatar if there is no userRoeland Jago Douma2015-12-171-1/+7
| | |/ / | |/| |
* | | | Merge pull request #21238 from owncloud/files-fixparsewebdavmtimeThomas Müller2015-12-172-6/+6
|\ \ \ \
| * | | | Fix files UI mtime parsing from webdavVincent Petry2015-12-162-6/+6
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1730-42/+70
| |_|/ / |/| | |
* | | | Merge pull request #21184 from owncloud/cli-logger-embedded-webserverThomas Müller2015-12-161-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Let's print error messages to the builtin webserver console ... makes develop...Thomas Müller2015-12-141-0/+3
* | | | Merge pull request #21232 from owncloud/fix-21230Thomas Müller2015-12-162-1/+42
|\ \ \ \
| * | | | add unit test for #21230Morris Jobke2015-12-161-0/+41
| * | | | Use name of ICollection for exception messageMorris Jobke2015-12-161-1/+1
|/ / / /
* | | | Merge pull request #21229 from owncloud/contrib-linktomaintainerspageforappsThomas Müller2015-12-161-14/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Replace list of apps with a linkVincent Petry2015-12-161-14/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-162-0/+20
* | | Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-usersC. Montero Luque2015-12-154-9/+203
|\ \ \
| * | | fix find DN by UUID for ADArthur Schiwon2015-12-141-13/+56
| * | | unit test on getHome in combination with OfflineUserArthur Schiwon2015-12-111-2/+52
| * | | adjust unit testArthur Schiwon2015-12-111-0/+8
| * | | look for DN changes before marking a user as deletedArthur Schiwon2015-12-113-3/+76
| * | | throw NoUserException in getHome when the requested user does not exist anymoreArthur Schiwon2015-12-111-5/+25
* | | | Merge pull request #21189 from owncloud/fix_21187Thomas Müller2015-12-152-1/+4
|\ \ \ \
| * | | | File shares can't have create permissionsRoeland Jago Douma2015-12-142-1/+4
* | | | | Merge pull request #21067 from owncloud/fix_20296Thomas Müller2015-12-1510-8/+105
|\ \ \ \ \
| * | | | | Fixed JS unit tests for fed owner display nameVincent Petry2015-12-141-0/+4
| * | | | | show display name but internally use the user nameBjörn Schießle2015-12-146-6/+11
| * | | | | don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-144-2/+90
| | |_|_|/ | |/| | |
* | | | | Merge pull request #21209 from owncloud/remove-unneeded-ldap-codeThomas Müller2015-12-151-16/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unneeded upgrade codeMorris Jobke2015-12-151-16/+0
|/ / / /
* | | | Merge pull request #21181 from owncloud/files-fixsharedrootdetectionThomas Müller2015-12-142-7/+40
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix mount type root detectionVincent Petry2015-12-142-7/+40
* | | | Merge pull request #21148 from owncloud/resetpassword-user-issertThomas Müller2015-12-141-3/+5
|\ \ \ \
| * | | | Check if user isset in $_REQUEST firstRobin Appelman2015-12-141-3/+5
| |/ / /
* | | | Merge pull request #21163 from owncloud/fix_20839Thomas Müller2015-12-141-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Files can't have create permissionsRoeland Jago Douma2015-12-111-4/+0
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1316-4/+74
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1288-0/+156
|/ /
* | Merge pull request #21153 from owncloud/files-deleteactiontextThomas Müller2015-12-113-5/+49
|\ \
| * | Bring back file delete action text to be based on contextVincent Petry2015-12-113-5/+49
* | | Merge pull request #20081 from owncloud/trashbin-loggedoutMorris Jobke2015-12-112-2/+16
|\ \ \ | |/ / |/| |
| * | skip test if we cant use the filesystem when not logged inRobin Appelman2015-12-111-2/+5
| * | Fix thrashbin wrapper when no user is loggedinRobin Appelman2015-12-112-2/+13
|/ /