summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | properly preserve home folder naming enforcement settingMorris Jobke2015-12-152-2/+7
* | | | Merge pull request #21198 from owncloud/fix_20296_8.2Thomas 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 #21152 from owncloud/backport-20978-stable8.2Morris Jobke2015-12-141-3/+5
|\ \ \
| * | | reset mailadress/displayname on blurmichag862015-12-111-3/+5
* | | | Merge pull request #21194 from owncloud/preview-non-existing-82Lukas Reschke2015-12-141-7/+11
|\ \ \ \
| * | | | Handle non existing files in version previewsRobin Appelman2015-12-141-7/+11
|/ / / /
* | | | Merge pull request #21182 from owncloud/stable8.2-share-allowdeleteinshareove...Vincent Petry2015-12-142-27/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Bring back delete permission in share overviewVincent Petry2015-12-142-27/+11
|/ / /
* | | Merge pull request #21157 from owncloud/trashbin-loggedout-82Thomas Müller2015-12-142-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
| |/ /
* | | Use XMLWriter to generate responseLukas Reschke2015-12-141-17/+26
* | | Merge pull request #21154 from owncloud/stable8.2-files-deleteactiontextMorris Jobke2015-12-113-5/+49
|\ \ \ | |/ / |/| |
| * | Bring back file delete action text to be based on contextVincent Petry2015-12-113-5/+49
|/ /
* | Merge pull request #21127 from owncloud/stable8.2-backport-21119Lukas Reschke2015-12-111-0/+7
|\ \
| * | Make AppManager->checkAppForUser more robustMorris Jobke2015-12-101-0/+7
* | | Merge pull request #21046 from owncloud/stable8.2-catchexceptionindirectdownl...Thomas Müller2015-12-112-3/+34
|\ \ \
| * | | Catch exception when querying direct download linkVincent Petry2015-12-092-3/+34
| | |/ | |/|
* | | Merge pull request #21115 from owncloud/stable8.2-backport-21109Roeland Douma2015-12-102-37/+10
|\ \ \
| * | | Deduplicate version expire jobsMorris Jobke2015-12-102-37/+10
* | | | Merge pull request #21113 from owncloud/memcache-lock-ttl-82Morris Jobke2015-12-105-4/+55
|\ \ \ \
| * | | | ttl for memcache locking backends that support itRobin Appelman2015-12-103-2/+11
| * | | | Add interface for memcache backends that support setting ttl on exisiting keysRobin Appelman2015-12-102-2/+44
| |/ / /
* | | | Merge pull request #21124 from owncloud/remove-db-locking-performance-warning...Vincent Petry2015-12-101-7/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove info about database locking performanceThomas Müller2015-12-101-7/+1
|/ / /
* | | Merge pull request #21090 from owncloud/backport-20995-stable8.2Vincent Petry2015-12-101-1/+5
|\ \ \
| * | | ensure multiselect always receives an array when setting its value, fixes #18734Arthur Schiwon2015-12-091-1/+5
* | | | Merge pull request #21101 from owncloud/stable8.2_20989Morris Jobke2015-12-101-0/+41
|\ \ \ \
| * | | | Update parent when moving share into recieved shareRoeland Jago Douma2015-12-101-0/+41
| |/ / /
* | | | Merge pull request #21112 from owncloud/db-lock-ttl-82Vincent Petry2015-12-102-10/+4
|\ \ \ \
| * | | | Remove all locks after ttl from the dbRobin Appelman2015-12-102-10/+4
| | |/ / | |/| |
* | | | Merge pull request #21100 from owncloud/stable8.2_21005Vincent Petry2015-12-101-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | The ajax code path unshares a link share when updating the passwordRoeland Jago Douma2015-12-101-0/+5
| |/ /
* | | Merge pull request #21044 from owncloud/group-propagation-82Vincent Petry2015-12-108-116/+311
|\ \ \
| * | | fix etag propagation with group resharesRobin Appelman2015-12-094-13/+65
| * | | Add test case for group share propagationRobin Appelman2015-12-094-103/+246
* | | | Merge pull request #21099 from owncloud/stable8.2_20949Roeland Douma2015-12-101-4/+2
|\ \ \ \
| * | | | [Sharing] Properly check if a group already has accessRoeland Jago Douma2015-12-101-4/+2
| | |/ / | |/| |
* | | | Merge pull request #20985 from owncloud/fix-mysql-setup-unix-socket-stable8.2Thomas Müller2015-12-101-6/+19
|\ \ \ \
| * | | | Add unix_socket support for mysql during initial installation - fixes #20210Thomas Müller2015-12-071-6/+19
* | | | | Merge pull request #21080 from owncloud/stable8.2-share-computesharepermissio...Roeland Douma2015-12-1010-29/+76
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add explicit check for groups excluded from sharingVincent Petry2015-12-091-1/+1
| * | | | Fix more unit tests to pass a mock storage instead of null to FileInfoVincent Petry2015-12-094-19/+54
| * | | | Add reshare permission checksVincent Petry2015-12-093-2/+9
| * | | | Compute share permissions in the viewVincent Petry2015-12-093-8/+13
* | | | | Merge pull request #21069 from owncloud/personal-mount-mountid-82Vincent Petry2015-12-092-4/+54
|\ \ \ \ \
| * | | | | Add testsRobin Appelman2015-12-091-0/+50