summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
* [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
|/ /
* | Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmtThomas Müller2015-12-111-3/+5
|\ \
| * | reset mailadress/displayname on blurmichag862015-12-071-3/+5
* | | Merge pull request #20878 from owncloud/proper-htaccess-support-in-code-signi...Thomas Müller2015-12-113-39/+8
|\ \ \
| * | | Don't write directives from CLILukas Reschke2015-12-081-0/+5
| * | | Run .htaccess updates in any caseLukas Reschke2015-12-082-18/+3
| * | | Remove version check out of .htaccessLukas Reschke2015-12-082-21/+0
* | | | Merge pull request #21144 from owncloud/dav-auth-checkduplicateheaderThomas Müller2015-12-111-1/+1
|\ \ \ \
| * | | | Properly check X-Requested-With header in case of multiple valuesVincent Petry2015-12-111-1/+1
* | | | | Merge pull request #21135 from owncloud/add-polyfillThomas Müller2015-12-1114-255/+37
|\ \ \ \ \
| * | | | | Adjust third-party referenceLukas Reschke2015-12-111-0/+0
| * | | | | Use PHP polyfillsLukas Reschke2015-12-1114-255/+37
* | | | | | Merge pull request #21020 from owncloud/add-directory-slash-to-setup-codeThomas Müller2015-12-112-3/+3
|\ \ \ \ \ \
| * | | | | | Add DirectorySlash to dynamic .htaccess writeLukas Reschke2015-12-082-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #21045 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-1114-16/+44
|\ \ \ \ \ \
| * | | | | | adjust PHPDocThomas Müller2015-12-102-0/+4
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-1014-16/+40
* | | | | | | Merge pull request #21087 from owncloud/catchexceptionindirectdownloadurlThomas Müller2015-12-112-3/+33
|\ \ \ \ \ \ \
| * | | | | | | Catch exception when querying direct download linkVincent Petry2015-12-102-3/+33
| |/ / / / / /
* | | | | | | Merge pull request #21128 from owncloud/dav-fopen-non-existingThomas Müller2015-12-111-8/+14
|\ \ \ \ \ \ \
| * | | | | | | Dont do a seperate request to check if a file exists for dav->fopenRobin Appelman2015-12-101-8/+14