summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-1350-100/+108
* Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-122-15/+103
|\
| * No newlines when heading is emptyJoas Schilling2017-04-122-3/+7
| * 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-122-3/+7
| * Properly escape heading, body and button textMorris Jobke2017-04-122-6/+12
| * Add addBodyButton to add a single button to email templatesMorris Jobke2017-04-122-0/+74
* | 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-122-0/+14
|\ \ \
| * | | Add sub() to the query function builderRobin Appelman2017-04-122-0/+14
| |/ /
* | | 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-127-10/+186
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-04-112-0/+4
| * | | Do proper DIRoeland Jago Douma2017-04-115-26/+3
| * | | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-113-10/+10
| * | | add tests for discovery serviceBjoern Schiessle2017-04-111-3/+3
| * | | provide public discovery service to discover OCS end-points on another serverBjoern Schiessle2017-04-114-0/+195
* | | | 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
* | | | Merge pull request #4310 from nextcloud/allow-plain-text-emailLukas Reschke2017-04-122-10/+31
|\ \ \ \
| * | | | Allow to set text versions for the plain text emailMorris Jobke2017-04-112-10/+31
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2017-04-1222-0/+88
|/ / /
* | | Remove constructor from interfaceLukas Reschke2017-04-111-11/+0
* | | Add IEMailTemplate to public OCP APILukas Reschke2017-04-117-10/+57
|/ /
* | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1114-30/+104
|\ \
| * | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-0914-30/+104
* | | 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
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1154-904/+252
* | | Merge pull request #4146 from nextcloud/unread-comments-folderMorris Jobke2017-04-104-90/+138
|\ \ \ | |/ / |/| |
| * | 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-303-89/+139
* | | 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
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-106-10/+18