summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add API to undelete delete group sharesRoeland Jago Douma2018-07-0510-0/+218
* Merge pull request #10103 from nextcloud/bugfix/9767/apps-management-issuesMorris Jobke2018-07-0510-29/+56
|\
| * Update settings jsJulius Härtl2018-07-042-3/+3
| * Fix displaying errorsJulius Härtl2018-07-042-8/+16
| * Hide uninstalled apps when removing themJulius Härtl2018-07-042-1/+2
| * Add transition when enabling/disabling appsJulius Härtl2018-07-042-14/+24
| * Fix invalid limit parameter when fetching groupsJulius Härtl2018-07-044-3/+11
|/
* Merge pull request #10083 from nextcloud/fix/noid/ldap-unsupported-avatar-formatblizzz2018-07-044-1039/+674
|\
| * let user set avatar in nextcloud von LDAP provides invalid image dataArthur Schiwon2018-07-034-13/+152
| * Iron User_LDAP testsArthur Schiwon2018-07-032-1029/+525
* | Merge pull request #10102 from nextcloud/bugfix/noid/fix-integration-tests-fe...Morris Jobke2018-07-041-0/+1
|\ \
| * | Fix integration tests for Federation 2.0Morris Jobke2018-07-041-0/+1
|/ /
* | Merge pull request #10101 from nextcloud/papercut/10094/oauth_tableMorris Jobke2018-07-044-7/+12
|\ \
| * | Do not show OAuth2 table if it is emptyRoeland Jago Douma2018-07-044-7/+12
* | | Merge pull request #10065 from nextcloud/rakekniven-patch-1Roeland Jago Douma2018-07-042-2/+2
|\ \ \
| * | | Update SettingsControllerTest.phprakekniven2018-06-301-1/+1
| * | | Update SettingsController.phprakekniven2018-06-301-1/+1
* | | | Merge pull request #9345 from nextcloud/federation20Morris Jobke2018-07-0351-667/+4356
|\ \ \ \
| * | | | cache results from ocm end-point discoveryBjoern Schiessle2018-07-021-0/+11
| * | | | remove unused codeBjoern Schiessle2018-07-021-24/+0
| * | | | fix return type from send shareBjoern Schiessle2018-07-022-2/+3
| * | | | always enable cloud federation apiBjoern Schiessle2018-07-023-2/+13
| * | | | look for correct OCM permissionsBjoern Schiessle2018-07-023-7/+95
| * | | | 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
| * | | | cleanup variable naming, it is actually a resource typeBjoern Schiessle2018-07-022-19/+17
| * | | | let the actual federated share provider check if incoming/outgoing shares are...Bjoern Schiessle2018-07-021-13/+0
| * | | | send the display name back after a federated share was receivedBjoern Schiessle2018-07-021-1/+7
| * | | | make sure that remote url gets stored with a trailing '/'Bjoern Schiessle2018-07-021-0/+5
| * | | | implement config checkBjoern Schiessle2018-07-021-3/+23
| * | | | fix external manager testsBjoern Schiessle2018-07-021-10/+29
| * | | | fix notification testsBjoern Schiessle2018-07-021-4/+19
| * | | | update testsBjoern Schiessle2018-07-021-259/+119
| * | | | remove unused methodBjoern Schiessle2018-07-021-24/+1
| * | | | add ocm-provider to the list of expected filesBjoern Schiessle2018-07-021-0/+1
| * | | | some minor fixes and clode cleanupBjoern Schiessle2018-07-0215-22/+109
| * | | | replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OC...Bjoern Schiessle2018-07-029-69/+33
| * | | | fix check for reshare permissionsBjoern Schiessle2018-07-021-1/+1
| * | | | send RESHARE_CHANGE_PERMISSION messageBjoern Schiessle2018-07-022-45/+114
| * | | | implement RESHARE_UNDO notificationBjoern Schiessle2018-07-023-5/+18
| * | | | - Don't remove share before all notifications are created, otherwise we miss ...Bjoern Schiessle2018-07-021-13/+3
| * | | | implement unshare notificationBjoern Schiessle2018-07-024-63/+145
| * | | | send reshare over OCM APIBjoern Schiessle2018-07-028-50/+157
| * | | | implement decline shareBjoern Schiessle2018-07-025-47/+131
| * | | | fix capabilitiesBjoern Schiessle2018-07-021-3/+7
| * | | | detect correctly if a share was send successfulBjoern Schiessle2018-07-021-1/+1
| * | | | implement accept share notificationBjoern Schiessle2018-07-028-76/+289
| * | | | adjust to latest api versionBjoern Schiessle2018-07-0214-55/+97
| * | | | update capabilitiesBjoern Schiessle2018-07-021-1/+5