summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* only move real files to the trash binBjoern Schiessle2015-07-162-2/+62
* Merge pull request #17653 from owncloud/backport-17330-share-group-path-excep...Morris Jobke2015-07-162-10/+158
|\
| * Make sure the owner always has the right pathJoas Schilling2015-07-151-3/+6
| * Add test case when owner renames shared folderVincent Petry2015-07-151-5/+8
| * Add unit test for getUsersSharingFileVincent Petry2015-07-151-0/+127
| * Fix the path for users which have an exception for a group shareJoas Schilling2015-07-151-7/+22
* | Merge pull request #17658 from owncloud/share-lock-owner-parent-stable81Vincent Petry2015-07-163-10/+134
|\ \
| * | only lock the parent foldersRobin Appelman2015-07-152-2/+13
| * | lock parent folders for the owner when locking a shared file as recipientRobin Appelman2015-07-153-10/+123
* | | Merge pull request #17556 from owncloud/enc_fix_migration_stable8.1Vincent Petry2015-07-162-14/+82
|\ \ \
| * | | more secure way to update the databaseBjoern Schiessle2015-07-102-14/+82
* | | | Merge pull request #17294 from owncloud/stable8.1-s2s-catchmoreexceptiontypesMorris Jobke2015-07-161-13/+7
|\ \ \ \
| * | | | Throw storage not available on guzzle errorVincent Petry2015-07-131-1/+1
| * | | | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
* | | | | Merge pull request #17337 from owncloud/stable8.1-backport-17077Morris Jobke2015-07-154-8/+58
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | handle invalid results from mount providersRobin Appelman2015-07-021-1/+4
| * | | | handle error during setupRobin Appelman2015-07-021-3/+5
| * | | | add unit testRobin Appelman2015-07-022-2/+48
| * | | | fix getting mount points when passing a path to the files:scan commandRobin Appelman2015-07-021-3/+2
* | | | | Merge pull request #17643 from owncloud/stable8.1-s2s-hasupdated-catch405Morris Jobke2015-07-151-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Throw StorageNotAvailable if propfind on root failedVincent Petry2015-07-141-1/+5
* | | | | Merge pull request #17642 from owncloud/stable8.1-backport-17565Björn Schießle2015-07-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | allow remote shares for users with email as usernamesFelix Böhm2015-07-141-1/+1
|/ / / /
* | | | Merge pull request #17632 from owncloud/stable8.1-backport-17606Vincent Petry2015-07-141-2/+2
|\ \ \ \
| * | | | Handle returned null value in app level codeMorris Jobke2015-07-141-2/+2
|/ / / /
* | | | Merge pull request #17607 from owncloud/stable8.1-backport-17426Thomas Müller2015-07-131-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | [config sample] Update info about appstoreMorris Jobke2015-07-131-1/+0
|/ / /
* | | Merge pull request #17288 from owncloud/stable8.1-chunk-cleanupgracefulonlockMorris Jobke2015-07-093-10/+107
|\ \ \
| * | | Catch cache garbage collection exception on postLoginVincent Petry2015-07-011-2/+8
| * | | Test for chunk cache garbage collectionVincent Petry2015-07-011-5/+89
| * | | Do not try clearing locked files in cache folderVincent Petry2015-07-011-3/+10
* | | | Merge pull request #17518 from owncloud/stable8.1-backport-config-sampleMorris Jobke2015-07-091-105/+117
|\ \ \ \
| * | | | [config sample] improve RST markup and wordingMorris Jobke2015-07-091-16/+26
| * | | | refine sample config textMorris Jobke2015-07-091-9/+12
| * | | | [config sample] merge Miscellaneous & All other optionsMorris Jobke2015-07-091-87/+86
|/ / / /
* | | | Merge pull request #17289 from owncloud/stable8.1-files-cleanuppartfileonlyonceMorris Jobke2015-07-081-4/+8
|\ \ \ \
| * | | | Only delete part file on error if it is really a part fileVincent Petry2015-07-011-2/+6
| * | | | Clean up part file only once, not twice on errorVincent Petry2015-07-011-2/+2
| |/ / /
* | | | Merge pull request #17332 from owncloud/fix-temporary-mountpoint-name-in-acti...Morris Jobke2015-07-082-2/+8
|\ \ \ \
| * | | | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
| | |_|/ | |/| |
* | | | Merge pull request #17338 from owncloud/stable8.1-backport-17252Morris Jobke2015-07-082-15/+23
|\ \ \ \
| * | | | Only do the description kung-fu on strings - fixes #17028Thomas Müller2015-07-022-15/+23
| | |_|/ | |/| |
* | | | Merge pull request #17366 from owncloud/fix_16740_8.1Morris Jobke2015-07-082-2/+4
|\ \ \ \
| * | | | call post_addToGroup als for class OC_User because sharing and LDAP are using...Bjoern Schiessle2015-07-031-0/+2
| * | | | owner is stored as 'uid_owner', not as 'owner' in the oc_share tableBjoern Schiessle2015-07-031-2/+2
* | | | | Merge pull request #17370 from owncloud/stable8.1-share-onlyshowstaticownerif...Morris Jobke2015-07-082-1/+18
|\ \ \ \ \
| * | | | | Do not show static share owner if not availableVincent Petry2015-07-032-1/+18
* | | | | | Merge pull request #17417 from owncloud/stable8.1-backport-17159Morris Jobke2015-07-082-2/+2
|\ \ \ \ \ \
| * | | | | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-07-062-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #17429 from owncloud/stable8.1-backport-17088Morris Jobke2015-07-083-0/+16
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 18:57:11 +0000