summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22337 from owncloud/new_reshare_no_initiatorThomas Müller2016-02-151-4/+4
|\
| * The owner and recipient can also be nullRoeland Jago Douma2016-02-121-3/+3
| * If the initiator no longer exists return UIDRoeland Jago Douma2016-02-121-1/+1
* | Merge pull request #22358 from owncloud/fix-22278Thomas Müller2016-02-154-5/+32
|\ \
| * | Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-124-5/+32
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1524-0/+214
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-144-0/+14
* | | Merge pull request #22351 from owncloud/fix_22277Thomas Müller2016-02-132-4/+168
|\ \ \
| * | | add remote server to the resultBjoern Schiessle2016-02-122-4/+168
* | | | Merge pull request #22331 from owncloud/dav-nonexisting-partThomas Müller2016-02-131-1/+1
|\ \ \ \
| * | | | fix getNodeForPath for non existing part filesRobin Appelman2016-02-111-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1318-6/+214
| |_|/ / |/| | |
* | | | Only register admin page when update is available Lukas Reschke2016-02-121-2/+1
* | | | Merge pull request #22292 from owncloud/smb-handle-forbiddenThomas Müller2016-02-121-1/+18
|\ \ \ \
| * | | | handle forbidden exceptions in smb backendRobin Appelman2016-02-101-1/+18
* | | | | Merge pull request #22294 from owncloud/carddav-report-list-groups-2Thomas Müller2016-02-125-2/+119
|\ \ \ \ \
| * | | | | Adding a custom webdav property which holds the list of contacts groupsThomas Müller2016-02-105-2/+119
| | |_|/ / | |/| | |
* | | | | Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298Thomas Müller2016-02-121-0/+4
|\ \ \ \ \
| * | | | | Reload list of shares on directory changeRoeland Jago Douma2016-02-111-0/+4
* | | | | | Merge pull request #22317 from owncloud/fix_invisible_linksharesThomas Müller2016-02-123-32/+183
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix migration step to avoind invisible sharesRoeland Jago Douma2016-02-112-32/+63
| * | | | | Add testsRoeland Jago Douma2016-02-111-0/+120
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-12124-276/+314
* | | | | Merge pull request #22320 from owncloud/files_external-cryptThomas Müller2016-02-113-5/+35
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | encrypt passwords for files_externalRobin Appelman2016-02-113-5/+35
| |/ / /
* | | | Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on...Thomas Müller2016-02-113-4/+17
|\ \ \ \
| * | | | Delete the notification when the owner unshares the remote before the user di...Joas Schilling2016-02-111-0/+7
| * | | | Remove the notification if accepting/declining failed because of 404Joas Schilling2016-02-112-4/+10
* | | | | Merge pull request #22290 from owncloud/dav-upload-scan-in-lockThomas Müller2016-02-111-5/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | also fix lock order for chunked dav uploadsRobin Appelman2016-02-101-2/+2
| * | | | scan the file in the write lock when uploading over davRobin Appelman2016-02-101-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #22281 from owncloud/activity-100-unshare-activitiesThomas Müller2016-02-111-16/+77
|\ \ \ \ | |_|/ / |/| | |
| * | | Add translations of unshare activitiesJoas Schilling2016-02-101-16/+77
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1172-50/+66
* | | Revert back to non-webdav download link for public URLsVincent Petry2016-02-102-7/+4
* | | Merge pull request #22276 from owncloud/harden-updater-authThomas Müller2016-02-103-5/+6
|\ \ \
| * | | Harden updater authenticationLukas Reschke2016-02-103-5/+6
* | | | Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-...Thomas Müller2016-02-102-16/+55
|\ \ \ \
| * | | | Chunk the queries to make sure they don't time outJoas Schilling2016-02-102-16/+55
| | |/ / | |/| |
* | | | Merge pull request #22273 from owncloud/versions-fixpathasrecipientThomas Müller2016-02-102-1/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Use full path of known file when handling versionsVincent Petry2016-02-101-1/+2
| * | | Remove path from versions responseVincent Petry2016-02-101-0/+5
| |/ /
* | | Merge pull request #22267 from owncloud/fix_encryption2Thomas Müller2016-02-102-25/+68
|\ \ \ | |_|/ |/| |
| * | remember signature version and only set it on update to make sure that otherBjoern Schiessle2016-02-102-12/+40
| * | use the version of the original file if we write the part file to have a prop...Bjoern Schiessle2016-02-101-15/+30
* | | Merge pull request #20073 from owncloud/files-should-add-download-dispositionThomas Müller2016-02-101-0/+17
|\ \ \
| * | | Only set the header if the node exists and in case the request is a GETThomas Müller2016-02-081-3/+8
| * | | Serve files with an attachment disposition for new DAV endpointLukas Reschke2016-02-081-0/+12
* | | | Merge pull request #22270 from owncloud/use-cache-directlyThomas Müller2016-02-101-5/+2
|\ \ \ \
| * | | | Use cache directly instead of QBLukas Reschke2016-02-101-5/+2
| | |_|/ | |/| |