summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-127-10/+186
|\ | | | | Discover federatedsharing endpoints
| * Update autoloaderRoeland Jago Douma2017-04-112-0/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Do proper DIRoeland Jago Douma2017-04-115-26/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-113-10/+10
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add tests for discovery serviceBjoern Schiessle2017-04-111-3/+3
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * provide public discovery service to discover OCS end-points on another serverBjoern Schiessle2017-04-114-0/+195
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Fix casing of same origin frame optionJoas Schilling2017-04-121-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-121-68/+0
|\ \ | | | | | | Removes unused code for link share emails
| * | Removes unused code for link share emailsMorris Jobke2017-04-111-68/+0
| | | | | | | | | | | | | | | | | | | | | * now handled by sharebymail app * see https://github.com/nextcloud/server/pull/657 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4310 from nextcloud/allow-plain-text-emailLukas Reschke2017-04-122-10/+31
|\ \ \ | | | | | | | | Allow to set text versions for the plain text email
| * | | Allow to set text versions for the plain text emailMorris Jobke2017-04-112-10/+31
| |/ / | | | | | | | | | | | | | | | * allows different texts for HTML and text version of the email Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2017-04-1222-0/+88
|/ /
* | Remove constructor from interfaceLukas Reschke2017-04-111-11/+0
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Add IEMailTemplate to public OCP APILukas Reschke2017-04-117-10/+57
|/ | | | | | Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1114-30/+104
|\ | | | | Move OC_Defaults to OCP\Defaults
| * Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-0914-30/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | * currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4283 from nextcloud/shares-by-folder-quoteMorris Jobke2017-04-101-1/+1
|\ \ | | | | | | properly quota table names in getSharesInFolder
| * | properly quota table names in getSharesInFolderRobin Appelman2017-04-101-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1154-904/+252
| | |
* | | Merge pull request #4146 from nextcloud/unread-comments-folderMorris Jobke2017-04-104-90/+138
|\ \ \ | |/ / |/| | Allow getting the unread comment count for an entire folder at once
| * | fix whitespace in cleantagsRobin Appelman2017-03-301-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | use castColumnRobin Appelman2017-03-301-4/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Add test for getting unread comment count by folderRobin Appelman2017-03-301-5/+6
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Allow getting the unread comment count for an entire folder at onceRobin Appelman2017-03-303-89/+139
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4277 from nextcloud/permissions-mask-scannerBjörn Schießle2017-04-101-0/+4
|\ \ \ | | | | | | | | Dont use the permissions mask while scanning
| * | | Dont use the permissions mask while scanningRobin Appelman2017-04-101-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4222 from nextcloud/dav-search-fileidRoeland Jago Douma2017-04-101-1/+3
|\ \ \ \ | |/ / / |/| | | Allow searching file by fileid
| * | | Allow searching file by fileidRobin Appelman2017-04-051-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4210 from nextcloud/downstream-26643Roeland Jago Douma2017-04-101-15/+15
|\ \ \ \ | | | | | | | | | | Removed path to datadir in exception
| * | | | Lowercase "data" correctlyJoas Schilling2017-04-101-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | removed path to datadirKawohl2017-04-041-13/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Also send the new account data with the eventJoas Schilling2017-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-106-10/+18
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0916-0/+18
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-084-6/+8
| |_|_|/ |/| | |
* | | | Merge pull request #4136 from nextcloud/expire-date-for-all-sharesMorris Jobke2017-04-074-60/+93
|\ \ \ \ | | | | | | | | | | Unified sharing options
| * | | | update unit testsBjoern Schiessle2017-04-073-45/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | setting to disable sending password by mailBjoern Schiessle2017-04-031-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | set expire date for all share typesBjoern Schiessle2017-04-032-25/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | add secure drop functionallity to mail sharesBjoern Schiessle2017-04-031-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | allow password protected mail sharesBjoern Schiessle2017-04-031-2/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | add new password column to the share table in order to set passwords for ↵Bjoern Schiessle2017-04-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | share by mails Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #4253 from nextcloud/downstream-27599Roeland Jago Douma2017-04-071-5/+10
|\ \ \ \ \ | | | | | | | | | | | | make JobList::next() lock free
| * | | | | make JobList::next() lock freeJörn Friedrich Dreyer2017-04-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Update autoloaderLukas Reschke2017-04-072-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Add support for themingLukas Reschke2017-04-073-33/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for theming in generated emails and simplify API Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | New layout for welcome emailMorris Jobke2017-04-072-0/+499
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * thanks to @espina2 for make this nice design * the button says "Set password" if the admin didn't specified a password Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Don't force the use of Accept-Language anymoreJoas Schilling2017-04-072-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not intended anymore, since it falls back to force english when the header is not set. Also 0228bc6e66cbcb2848eacb41f1de6e7f63ebcb65 makes clear that the order should be: 1. User setting 2. Accept language 3. Admin default This is the case since the commit from above, unless via OCS and DAV. Both forced to accept-language falling back to english. By removing the force, it now also matches the w3 priority list: https://www.w3.org/International/questions/qa-lang-priorities Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-074-2/+46
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0618-4/+28
| | | | |