summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9895 from nextcloud/fed-group-sharesMorris Jobke2018-07-1120-196/+591
|\
| * fix unit testsBjoern Schiessle2018-07-112-1/+4
| * update unit testsBjoern Schiessle2018-07-117-40/+120
| * start to get fed group shares into the share dialogBjoern Schiessle2018-07-111-0/+10
| * handle unshare request from ownerBjoern Schiessle2018-07-111-18/+25
| * unshare from selfBjoern Schiessle2018-07-111-10/+15
| * accept/decline group sharesBjoern Schiessle2018-07-114-15/+98
| * fix notification when a group share is receivedBjoern Schiessle2018-07-111-9/+15
| * implement federated group sharesBjoern Schiessle2018-07-1110-111/+251
| * add setting to enable/disable federated group sharingBjoern Schiessle2018-07-113-2/+63
* | Merge pull request #9942 from nextcloud/feature/2338/invitation_response_in_e...Roeland Jago Douma2018-07-1117-10/+1345
|\ \
| * | Bump version of app else migrations don't runRoeland Jago Douma2018-06-291-1/+1
| * | Include accept / decline links in CalDAV invitation emailsGeorg Ehrke2018-06-2917-9/+1344
* | | Merge pull request #10025 from nextcloud/smb-rename-invalidargument-retryMorris Jobke2018-07-111-3/+17
|\ \ \
| * | | also retry rename operation on InvalidArgumentExceptionRobin Appelman2018-06-271-3/+17
* | | | Merge pull request #10098 from nextcloud/feature/noid/ldap-image-attributeMorris Jobke2018-07-119-50/+221
|\ \ \ \
| * | | | adjust and add more unit testsArthur Schiwon2018-07-054-18/+96
| * | | | allow admin to disable fetching of avatars as well as a specific attributeArthur Schiwon2018-07-057-33/+126
* | | | | Merge pull request #10177 from nextcloud/bugfix/noid/theming-load-with-custom...Morris Jobke2018-07-111-33/+27
|\ \ \ \ \
| * | | | | Load theming app css as well if legacy theme is enabledJulius Härtl2018-07-101-33/+27
| | |_|_|/ | |/| | |
* / | | | [tx-robot] updated from transifexNextcloud bot2018-07-1132-44/+152
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-07-10328-1440/+1686
* | | | always log exceptions on dav writeRobin Appelman2018-07-091-0/+1
* | | | Bump webpack from 4.14.0 to 4.15.1 in /apps/updatenotificationdependabot[bot]2018-07-092-127/+122
* | | | Merge pull request #10152 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-07-092-119/+116
|\ \ \ \
| * | | | Bump webpack from 4.14.0 to 4.15.1 in /apps/accessibilitydependabot[bot]2018-07-092-119/+116
* | | | | Merge pull request #10151 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-07-092-2481/+40
|\ \ \ \ \
| * | | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/updatenotificationdependabot[bot]2018-07-092-2481/+40
| |/ / / /
* / / / / Bump babel-loader from 7.1.4 to 7.1.5 in /apps/accessibilitydependabot[bot]2018-07-092-4/+4
|/ / / /
* | | | Merge pull request #10144 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-07-092-959/+23
|\ \ \ \
| * | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2dependabot[bot]2018-07-092-959/+23
* | | | | Merge pull request #10145 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-07-092-119/+116
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2dependabot[bot]2018-07-082-119/+116
* | | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibilitydependabot[bot]2018-07-082-993/+32
|/ / / /
* | | | Fixed jsunitJohn Molakvoæ (skjnldsv)2018-07-051-2/+2
* | | | Fix exceptionRoeland Jago Douma2018-07-051-0/+1
* | | | Fix testsRoeland Jago Douma2018-07-051-0/+15
* | | | Always show menuJohn Molakvoæ (skjnldsv)2018-07-051-13/+11
* | | | Disable sidebar on deleted shareJohn Molakvoæ (skjnldsv)2018-07-054-9/+23
* | | | Js magic for deleted sharesJohn Molakvoæ (skjnldsv)2018-07-057-19/+175
* | | | getDeletedSharedWith methodJohn Molakvoæ (skjnldsv)2018-07-051-11/+1
* | | | Add API to undelete delete group sharesRoeland Jago Douma2018-07-056-0/+144
|/ / /
* | | 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 #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