summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-121-12/+88
|\
| * No newlines when heading is emptyJoas Schilling2017-04-121-2/+5
| * make the plain text footer standard compliant and add a space after '--'. It ...Bjoern Schiessle2017-04-121-1/+1
| * Use instance name as alt-textJoas Schilling2017-04-121-2/+2
| * Don't duplicate the sentence with the headerJoas Schilling2017-04-121-2/+5
| * Properly escape heading, body and button textMorris Jobke2017-04-121-5/+11
| * Add addBodyButton to add a single button to email templatesMorris Jobke2017-04-121-0/+64
* | Merge pull request #4282 from nextcloud/oci-connect-stringMorris Jobke2017-04-122-24/+36
|\ \
| * | use the same oci connectstring in all code pathsRobin Appelman2017-04-102-24/+36
* | | Merge pull request #4331 from nextcloud/query-builder-sumMorris Jobke2017-04-121-0/+4
|\ \ \
| * | | Add sub() to the query function builderRobin Appelman2017-04-121-0/+4
| |/ /
* | | Merge pull request #4329 from nextcloud/move-out-shared-folderMorris Jobke2017-04-123-43/+50
|\ \ \
| * | | use unjailed path when moving files out of a shared storageRobin Appelman2017-04-121-2/+9
| * | | rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::get...Robin Appelman2017-04-122-41/+41
| |/ /
* | | Merge pull request #4325 from nextcloud/downstream-27522Roeland Jago Douma2017-04-121-2/+4
|\ \ \ | |_|/ |/| |
| * | Optimize put - Dont try to fetch filecache for not existing filecache in encr...Piotr M2017-04-121-2/+4
* | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-124-10/+134
|\ \ \
| * | | Do proper DIRoeland Jago Douma2017-04-114-20/+3
| * | | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-112-10/+4
| * | | add tests for discovery serviceBjoern Schiessle2017-04-111-3/+3
| * | | provide public discovery service to discover OCS end-points on another serverBjoern Schiessle2017-04-113-0/+147
* | | | Fix casing of same origin frame optionJoas Schilling2017-04-121-1/+1
| |/ / |/| |
* | | Merge pull request #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-121-68/+0
|\ \ \
| * | | Removes unused code for link share emailsMorris Jobke2017-04-111-68/+0
* | | | Allow to set text versions for the plain text emailMorris Jobke2017-04-111-7/+24
|/ / /
* / / Add IEMailTemplate to public OCP APILukas Reschke2017-04-114-115/+26
|/ /
* | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1112-26/+61
|\ \
| * | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-0912-26/+61
* | | Merge pull request #4283 from nextcloud/shares-by-folder-quoteMorris Jobke2017-04-101-1/+1
|\ \ \
| * | | properly quota table names in getSharesInFolderRobin Appelman2017-04-101-1/+1
| | |/ | |/|
* | | Merge pull request #4146 from nextcloud/unread-comments-folderMorris Jobke2017-04-103-90/+126
|\ \ \ | |/ / |/| |
| * | fix whitespace in cleantagsRobin Appelman2017-03-301-1/+1
| * | use castColumnRobin Appelman2017-03-301-4/+1
| * | Add test for getting unread comment count by folderRobin Appelman2017-03-301-5/+6
| * | Allow getting the unread comment count for an entire folder at onceRobin Appelman2017-03-302-89/+127
* | | Merge pull request #4277 from nextcloud/permissions-mask-scannerBjörn Schießle2017-04-101-0/+4
|\ \ \
| * | | Dont use the permissions mask while scanningRobin Appelman2017-04-101-0/+4
* | | | Merge pull request #4222 from nextcloud/dav-search-fileidRoeland Jago Douma2017-04-101-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Allow searching file by fileidRobin Appelman2017-04-051-1/+3
* | | | Merge pull request #4210 from nextcloud/downstream-26643Roeland Jago Douma2017-04-101-15/+15
|\ \ \ \
| * | | | Lowercase "data" correctlyJoas Schilling2017-04-101-6/+6
| * | | | removed path to datadirKawohl2017-04-041-13/+13
* | | | | Also send the new account data with the eventJoas Schilling2017-04-101-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #4136 from nextcloud/expire-date-for-all-sharesMorris Jobke2017-04-073-59/+92
|\ \ \ \
| * | | | update unit testsBjoern Schiessle2017-04-072-44/+29
| * | | | setting to disable sending password by mailBjoern Schiessle2017-04-031-3/+5
| * | | | set expire date for all share typesBjoern Schiessle2017-04-032-25/+48
| * | | | add secure drop functionallity to mail sharesBjoern Schiessle2017-04-031-1/+3
| * | | | allow password protected mail sharesBjoern Schiessle2017-04-031-2/+23
| * | | | add new password column to the share table in order to set passwords for shar...Bjoern Schiessle2017-04-031-3/+3