summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10130 from nextcloud/3rdparty/noid/symfony-3.4.12Roeland Jago Douma2018-07-061-0/+0
|\ | | | | [3rdparty] Bump symfony depts to 3.4.12
| * [3rdparty] Bump symfony depts to 3.4.12Roeland Jago Douma2018-07-061-0/+0
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailerJoas Schilling2018-07-0610-66/+85
|\ | | | | Upgrade to swiftmailer-6
| * Add warning to setup checks if the default mailer is still phpRoeland Jago Douma2018-07-043-1/+44
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix settings testsRoeland Jago Douma2018-07-041-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Swift to \Swift_Mailer as abstractionRoeland Jago Douma2018-07-042-33/+21
| | | | | | | | | | | | | | * \Swift_Mailer handles starting the transport etc properly * Fixed tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Make swift 6 compatibleRoeland Jago Douma2018-07-041-26/+16
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Kill php mail from settingsRoeland Jago Douma2018-07-043-9/+7
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [3rdparty] Bump swiftmailer 6.0.2Roeland Jago Douma2018-07-041-0/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10128 from nextcloud/fix/noid/add_locale_to_templatesMorris Jobke2018-07-063-3/+3
|\ \ | | | | | | Add locale to templates
| * | Add locale to templatesRoeland Jago Douma2018-07-063-3/+3
|/ / | | | | | | | | | | | | | | It was already added to the user template but we should add it to all templates. Else apps that want the locale but use special templating (hi richdocuments!) will fail. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10119 from nextcloud/bugfix/noid/fix-remnants-of-refactoringRoeland Jago Douma2018-07-051-2/+2
|\ \ | | | | | | Fix remnants of refactoring
| * | Fix remnants of refactoringMorris Jobke2018-07-051-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9909 from ↵Morris Jobke2018-07-0518-18/+443
|\ \ | | | | | | | | | | | | nextcloud/feature/2192/allow_group_share_undeletion Add API to undelete delete group shares
| * | Fixed jsunitJohn Molakvoæ (skjnldsv)2018-07-051-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix exceptionRoeland Jago Douma2018-07-051-0/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix testsRoeland Jago Douma2018-07-051-0/+15
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix PHPDocMorris Jobke2018-07-051-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Always show menuJohn Molakvoæ (skjnldsv)2018-07-051-13/+11
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Disable sidebar on deleted shareJohn Molakvoæ (skjnldsv)2018-07-054-9/+23
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Js magic for deleted sharesJohn Molakvoæ (skjnldsv)2018-07-057-19/+175
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | getDeletedSharedWith methodJohn Molakvoæ (skjnldsv)2018-07-053-11/+34
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Add API to undelete delete group sharesRoeland Jago Douma2018-07-0510-0/+218
|/ / | | | | | | | | | | | | | | | | | | | | When a group share is deleted we keep track of this in the DB. Right now it is only possible for a recipient to get back the share by asking the sharer to delete it and to share it again. This doesn't scale. This endpoint makes it possible to get back the share. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10103 from nextcloud/bugfix/9767/apps-management-issuesMorris Jobke2018-07-0510-29/+56
|\ \ | | | | | | Fix remaining apps management issues
| * | Update settings jsJulius Härtl2018-07-042-3/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix displaying errorsJulius Härtl2018-07-042-8/+16
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Hide uninstalled apps when removing themJulius Härtl2018-07-042-1/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add transition when enabling/disabling appsJulius Härtl2018-07-042-14/+24
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix invalid limit parameter when fetching groupsJulius Härtl2018-07-044-3/+11
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #10083 from nextcloud/fix/noid/ldap-unsupported-avatar-formatblizzz2018-07-044-1039/+674
|\ \ | | | | | | LDAP user should be able to set avatar if directory provides incompatible image
| * | let user set avatar in nextcloud von LDAP provides invalid image dataArthur Schiwon2018-07-034-13/+152
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | Iron User_LDAP testsArthur Schiwon2018-07-032-1029/+525
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #10102 from ↵Morris Jobke2018-07-041-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-integration-tests-federation-2.0 Fix integration tests for Federation 2.0
| * | | Fix integration tests for Federation 2.0Morris Jobke2018-07-041-0/+1
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #10101 from nextcloud/papercut/10094/oauth_tableMorris Jobke2018-07-044-7/+12
|\ \ \ | | | | | | | | Do not show OAuth2 table if it is empty
| * | | Do not show OAuth2 table if it is emptyRoeland Jago Douma2018-07-044-7/+12
| | |/ | |/| | | | | | | | | | | | | For #10094 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10065 from nextcloud/rakekniven-patch-1Roeland Jago Douma2018-07-042-2/+2
|\ \ \ | | | | | | | | Update SettingsController.php
| * | | Update SettingsControllerTest.phprakekniven2018-06-301-1/+1
| | | | | | | | | | | | adapted test for grammar change of URL
| * | | Update SettingsController.phprakekniven2018-06-301-1/+1
| | | | | | | | | | | | | | | | Grammar fix. Uppercase URL See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/146983238?q=issue%3Aopen
* | | | Merge pull request #9345 from nextcloud/federation20Morris Jobke2018-07-0351-667/+4356
|\ \ \ \ | | | | | | | | | | Federation 2.0
| * | | | cache results from ocm end-point discoveryBjoern Schiessle2018-07-021-0/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | remove unused codeBjoern Schiessle2018-07-021-24/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | fix return type from send shareBjoern Schiessle2018-07-022-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | always enable cloud federation apiBjoern Schiessle2018-07-023-2/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | look for correct OCM permissionsBjoern Schiessle2018-07-023-7/+95
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | remove debug outputBjoern Schiessle2018-07-021-1/+0
| | | | |
| * | | | remove the makefileBjoern Schiessle2018-07-021-50/+0
| | | | |
| * | | | add support for different share typesBjoern Schiessle2018-07-023-24/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | cleanup variable naming, it is actually a resource typeBjoern Schiessle2018-07-022-19/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | let the actual federated share provider check if incoming/outgoing shares ↵Bjoern Schiessle2018-07-021-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are enabled for the specific resource type Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 13:41:49 +0000