summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change LDAP method namesMorris Jobke2017-04-125-20/+20
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4325 from nextcloud/downstream-27522Roeland Jago Douma2017-04-122-6/+13
|\ | | | | Optimize put - Dont try to fetch filecache for not existing filecache…
| * Simplify the testJoas Schilling2017-04-121-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Optimize put - Dont try to fetch filecache for not existing filecache in ↵Piotr M2017-04-122-6/+13
| | | | | | | | encription
* | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-1234-509/+502
|\ \ | | | | | | 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-1117-39/+16
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | give old end-points a seperate nameBjoern Schiessle2017-04-112-2/+33
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix constructorBjoern Schiessle2017-04-112-2/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-1118-468/+81
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add tests for discovery serviceBjoern Schiessle2017-04-112-3/+102
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | adjust existing testsBjoern Schiessle2017-04-114-12/+42
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | get addressbook url and carddav user from remote serverBjoern Schiessle2017-04-113-21/+35
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | use discovered end-point for trusted serversBjoern Schiessle2017-04-112-6/+36
| | | | | | | | | | | | 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>
* | | Merge pull request #4323 from nextcloud/downstream-27613Roeland Jago Douma2017-04-122-6/+12
|\ \ \ | | | | | | | | Allow file upload when storage is unlimited
| * | | Allow file upload when storage is unlimitedJoas Schilling2017-04-122-6/+12
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4324 from nextcloud/downstream-27581-27602Roeland Jago Douma2017-04-124-5/+5
|\ \ \ | |/ / |/| | Fix casing of same origin frame option
| * | Fix casing of same origin frame optionJoas Schilling2017-04-124-5/+5
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3905 from nextcloud/downstream-27069Joas Schilling2017-04-125-10/+174
|\ \ | | | | | | Add integration test for trashbin
| * | Add drone.yml configMorris Jobke2017-04-111-0/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add integration test for trashbinVincent Petry2017-04-114-10/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for basic deletion. Add test when deleting from shared folder as recipient. Add test to check that metadata stays when moving out of shared folder as recipient. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4317 from nextcloud/cleanup-files_trashbin-updateBjörn Schießle2017-04-121-42/+0
|\ \ \ | | | | | | | | [files_trashbin] Remove unneeded update steps
| * | | [files_trashbin] Remove unneeded update stepsMorris Jobke2017-04-121-42/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4316 from nextcloud/cleanup-files_sharing-updateBjörn Schießle2017-04-122-263/+0
|\ \ \ \ | | | | | | | | | | [files_sharing] Remove unneeded update steps
| * | | | [files_sharing] Remove unneeded update stepsMorris Jobke2017-04-122-263/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4312 from nextcloud/cleanup-nameBjörn Schießle2017-04-1254-113/+113
|\ \ \ \ | | | | | | | | | | Update comments to Nextcloud
| * | | | Update comments to NextcloudMorris Jobke2017-04-1154-113/+113
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * based on PR by @Ardinis * see #4311 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4315 from nextcloud/cleanup-files_external-updateLukas Reschke2017-04-123-88/+0
|\ \ \ \ | | | | | | | | | | [files_external] Remove unneeded update steps
| * | | | [files_external] Remove unneeded update stepsMorris Jobke2017-04-123-88/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-124-243/+0
|\ \ \ \ | | | | | | | | | | Removes unused code for link share emails
| * | | | Removes unused code for link share emailsMorris Jobke2017-04-114-243/+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-124-10/+84
|\ \ \ \ | | | | | | | | | | Allow to set text versions for the plain text email
| * | | | Allow to set text versions for the plain text emailMorris Jobke2017-04-114-10/+84
| |/ / / | | | | | | | | | | | | | | | | | | | | * allows different texts for HTML and text version of the email Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4314 from nextcloud/remove-not-needed-update.phpLukas Reschke2017-04-121-98/+0
|\ \ \ \ | | | | | | | | | | Remove update.php of files app
| * | | | Remove update.php of files appMorris Jobke2017-04-121-98/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | * contains only update steps for 8.1/8.2 to 9.0 update Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / [tx-robot] updated from transifexNextcloud bot2017-04-1262-26/+244
|/ / /
* | | Merge pull request #4304 from nextcloud/add-email-template-to-ocpMorris Jobke2017-04-1111-31/+82
|\ \ \ | |/ / |/| | Add IEMailTemplate to public OCP API
| * | Remove constructor from interfaceLukas Reschke2017-04-111-11/+0
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Adjust class referencesLukas Reschke2017-04-113-3/+3
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Add IEMailTemplate to public OCP APILukas Reschke2017-04-118-21/+83
| | | | | | | | | | | | | | | | | | 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 #4302 from nextcloud/test-integration-testRoeland Jago Douma2017-04-113-1/+36
|\ \ \ | | | | | | | | [Integration Tests] Clear opcode cache after config change
| * | | Clear opcode cache after config changeLukas Reschke2017-04-113-1/+36
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #3876 from nextcloud/downstream-26583Roeland Jago Douma2017-04-116-31/+98
|\ \ \ | | | | | | | | Share api expanded by tags
| * | | share api expanded by tags (#26583)Michael Jobst2017-04-116-31/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * share api expanded by tags * Modified files_sharing JS Unit tests * modified tests. renamed request parameter. refactoring * Update Share20OCS.php Added missing function description * Update Helper.php Added missing function description * Update Helper.php implicit boolean conversion to !empty() * Update Share20OCSTest.php Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4285 from nextcloud/bump-md5Morris Jobke2017-04-117-598/+13
|\ \ \ \ | |/ / / |/| | | [js] Bump blueimp-md5
| * | | [js] Bump blueimp-md5 a major versionRoeland Jago Douma2017-04-104-43/+10
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | [js] Bump blueimp-md5Roeland Jago Douma2017-04-106-562/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * bumped to latest * moved to min Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4293 from nextcloud/fix_4248Morris Jobke2017-04-111-0/+6
|\ \ \ \ | |_|/ / |/| | | Do reload shared views
| * | | Do reload shared viewsRoeland Jago Douma2017-04-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4248 The magic introduced in #3686 caused the shared views not to be updated properly. Thus we just overwrite the _onUrlChange method in the sharedfilelist. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 21:06:14 +0000