summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed JS unit tests for fed owner display nameVincent Petry2015-12-151-0/+4
* show display name but internally use the user nameBjörn Schießle2015-12-156-6/+12
* don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-154-2/+81
* Merge pull request #21151 from owncloud/backport-20978-stable8.1Morris Jobke2015-12-141-3/+5
|\
| * reset mailadress/displayname on blurmichag862015-12-111-3/+5
* | Merge pull request #21193 from owncloud/preview-non-existing-81Lukas Reschke2015-12-141-7/+11
|\ \
| * | Handle non existing files in version previewsRobin Appelman2015-12-141-7/+11
| |/
* | Merge pull request #21156 from owncloud/trashbin-loggedout-81Thomas 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 #21091 from owncloud/backport-20995-stable8.1Vincent 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 #21116 from owncloud/stable8.1-backport-21109Vincent Petry2015-12-102-37/+10
|\ \
| * | Deduplicate version expire jobsMorris Jobke2015-12-102-37/+10
|/ /
* | Merge pull request #21102 from owncloud/stable8.1_20989Vincent Petry2015-12-101-0/+38
|\ \
| * | Update parent when moving share into recieved shareRoeland Jago Douma2015-12-101-0/+38
| |/
* | Merge pull request #21081 from owncloud/stable8.1-share-computesharepermissio...Morris Jobke2015-12-1010-29/+75
|\ \ | |/ |/|
| * 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/+53
| * Add reshare permission checksVincent Petry2015-12-093-2/+9
| * Compute share permissions in the viewVincent Petry2015-12-093-8/+13
* | Merge pull request #21085 from owncloud/occ-shall-not-fail-hard-in-maintenanc...Vincent Petry2015-12-091-3/+5
|\ \ | |/ |/|
| * Don't load commands of apps when in maintenance mode - fixes #20939Thomas Müller2015-12-091-3/+5
|/
* Merge pull request #21042 from owncloud/backport-21037-stable8.1Morris Jobke2015-12-081-1/+1
|\
| * passing an empty base in this diagnosis call will not result in LDAP errorsArthur Schiwon2015-12-081-1/+1
|/
* Merge pull request #20999 from owncloud/backport-20981-multiple-emails-for-sh...Morris Jobke2015-12-072-4/+22
|\
| * Add a unit test for single user case as wellJoas Schilling2015-12-071-7/+9
| * Allow sending a share email to multiple usersJoas Schilling2015-12-072-4/+20
* | Merge pull request #20986 from owncloud/use-proper-logexception-stable8.1Thomas Müller2015-12-072-2/+2
|\ \ | |/ |/|
| * ILogger has no logException() - fixes #20797Thomas Müller2015-12-072-2/+2
|/
* Merge pull request #20795 from owncloud/stable8.1-backport-20790Vincent Petry2015-12-043-26/+12
|\
| * Deduplicate queued trashbin expire jobsMorris Jobke2015-11-273-26/+12
* | Merge pull request #20956 from owncloud/stable8.1-backport-20877Morris Jobke2015-12-041-1/+7
|\ \
| * | Check the expiration date for nullMorris Jobke2015-12-041-1/+7
|/ /
* | Merge pull request #20489 from owncloud/backport-20487-8.1Vincent Petry2015-12-032-7/+23
|\ \
| * | Add a unit test that executes the queryJoas Schilling2015-11-181-0/+13
| * | Oracle can not return statements but only valuesJoas Schilling2015-11-132-7/+10
* | | Merge pull request #20831 from owncloud/catch-missing-route-81Thomas Müller2015-11-304-9/+30
|\ \ \ | |_|/ |/| |
| * | Dont die when we're missing a routeRobin Appelman2015-11-304-9/+30
|/ /
* | Merge pull request #20764 from owncloud/scan-eventsource-no-paths-81Vincent Petry2015-11-261-8/+0
|\ \
| * | Dont output paths in scan.phpRobin Appelman2015-11-261-8/+0
| |/
* | Merge pull request #20698 from owncloud/stable8.1-backport-19530Morris Jobke2015-11-252-1/+36
|\ \
| * | Add a unit test for "share a file inside a folder that is already shared"Joas Schilling2015-11-241-0/+33
| * | Make sure all variables are definedJoas Schilling2015-11-241-0/+2
| * | Make sure the share we found is for the same itemJoas Schilling2015-11-241-1/+1
|/ /
* | Merge pull request #20678 from owncloud/backport-joblist-fix-8.1Morris Jobke2015-11-231-11/+23
|\ \
| * | Make the JobList test more robust by sorting the result of getAll before comp...Joas Schilling2015-11-231-11/+23
|/ /
* | Merge pull request #20637 from owncloud/cache-escape-like-81Morris Jobke2015-11-204-1/+52
|\ \ | |/ |/|
| * escape like parameter in cache moveRobin Appelman2015-11-201-1/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 02:33:17 +0000