summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Was already registered in ServerRoeland Jago Douma2018-11-021-3/+0
* | | | | | | | Merge pull request #12004 from nextcloud/dl-vcf-groups-pluginJohn Molakvoæ2018-11-054-0/+126
|\ \ \ \ \ \ \ \
| * | | | | | | | Added multi-get vcf download pluginJohn Molakvoæ (skjnldsv)2018-11-044-0/+126
* | | | | | | | | Merge pull request #12260 from nextcloud/dependabot/npm_and_yarn/build/node-s...Roeland Jago Douma2018-11-052-8/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump node-sass from 4.9.4 to 4.10.0 in /builddependabot[bot]2018-11-052-8/+13
* | | | | | | | | | Merge pull request #12253 from nextcloud/2fa-settings-hintRoeland Jago Douma2018-11-051-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add class "settings-hint" to 2FA-textMarius Blüm2018-11-051-2/+2
* | | | | | | | | | | Merge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-11-052-102/+102
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibilitydependabot[bot]2018-11-052-102/+102
* | | | | | | | | | | Merge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-11-053-38/+37
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rebuild assetsRoeland Jago Douma2018-11-051-1/+1
| * | | | | | | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibilitydependabot[bot]2018-11-052-37/+36
* | | | | | | | | | | Merge pull request #12265 from nextcloud/dav-bumpRoeland Jago Douma2018-11-052-7/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | bump dav version for migrationJohn Molakvoæ (skjnldsv)2018-11-052-7/+9
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2John Molakvoæ2018-11-051-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | make twofactor .button inlin-blockJonas Sulzer2018-11-041-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #12266 from nextcloud/bump/npm/settingsRoeland Jago Douma2018-11-058-195/+408
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump npm deps: settingsRoeland Jago Douma2018-11-058-195/+408
* | | | | | | | | | | Merge pull request #12252 from nextcloud/theming-advanced-h3Roeland Jago Douma2018-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change "Advanced options" to h3Marius Blüm2018-11-041-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #12263 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-11-052-101/+101
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2dependabot[bot]2018-11-052-101/+101
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #12264 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-11-052-29/+36
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2dependabot[bot]2018-11-052-29/+36
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-11-052-29/+36
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotificationdependabot[bot]2018-11-052-29/+36
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-11-052-101/+101
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotificationdependabot[bot]2018-11-052-101/+101
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #12257 from nextcloud/dependabot/npm_and_yarn/settings/nex...dependabot[bot]2018-11-052-13/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump nextcloud-vue from 0.2.0 to 0.3.1 in /settingsdependabot[bot]2018-11-052-13/+40
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_renderRoeland Jago Douma2018-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Set the filemodel before rending the detailsviewRoeland Jago Douma2018-11-021-1/+1
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-11-0522-18/+108
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #12105 from nextcloud/using-resharing-right-to-display-sharesRoeland Jago Douma2018-11-047-23/+141
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revert testsMaxence Lange2018-11-022-11/+11
| * | | | | | | | | user can have his resharing rights revoked, yet seeing created sharesMaxence Lange2018-11-022-10/+19
| * | | | | | | | | check parents resharing rightsMaxence Lange2018-11-021-6/+14
| * | | | | | | | | Use property to check if a share entry is shared with the current userJulius Härtl2018-11-023-13/+17
| * | | | | | | | | Add uid_owner to enable permission settings on the viewsJulius Härtl2018-11-021-1/+8
| * | | | | | | | | Remove reshare owner entry from the share listJulius Härtl2018-11-021-0/+3
| * | | | | | | | | Show share settings for owner and reshare owners onlyJulius Härtl2018-11-024-7/+33
| * | | | | | | | | limit to circles moderatorMaxence Lange2018-11-021-1/+2
| * | | | | | | | | display shares to circles moderatorMaxence Lange2018-11-021-0/+22
| * | | | | | | | | shares are displayed to users with resharing rightsMaxence Lange2018-11-022-11/+49
* | | | | | | | | | Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelockRoeland Jago Douma2018-11-043-20/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix testsRoeland Jago Douma2018-11-042-20/+10
| * | | | | | | | | Do not log FileLock as exceptionRoeland Jago Douma2018-11-041-0/+3
|/ / / / / / / / /
* | | | | | / / / [tx-robot] updated from transifexNextcloud bot2018-11-0450-44/+254
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge pull request #10890 from nextcloud/bugfix/10857/app-menu-resizeRoeland Jago Douma2018-11-032-4/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix app menu calculation for random size of the right headerJulius Härtl2018-11-022-4/+9
| | |_|/ / / / / | |/| | | | | |