summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #12242 from nextcloud/uid-conccurencyJohn Molakvoæ2018-11-052-25/+125
|\ \ \ \ \ \
| * | | | | | Phpunit testsJohn Molakvoæ (skjnldsv)2018-11-051-25/+112
| * | | | | | Add check for vCard uidJohn Molakvoæ (skjnldsv)2018-11-051-0/+13
* | | | | | | Merge pull request #12191 from nextcloud/sessions-fixesRoeland Jago Douma2018-11-054-27/+33
|\ \ \ \ \ \ \
| * | | | | | | Sessions: Make delete and filesystem access options tabbableJan-Christoph Borchardt2018-11-012-4/+4
| * | | | | | | Add device settings tooltip for accessibilityJan-Christoph Borchardt2018-11-013-12/+13
| * | | | | | | Fix missing keyboard focus ability and feedback for sessions action menuJan-Christoph Borchardt2018-11-012-3/+4
| * | | | | | | Fix double tr creation in session listJan-Christoph Borchardt2018-11-011-1/+1
| * | | | | | | Remove tooltip from sessions, just wrap lines for simplicity and no duplicationJan-Christoph Borchardt2018-11-012-9/+13
| * | | | | | | Remove unnecessary 'Delete' title from 'Revoke' menu entryJan-Christoph Borchardt2018-11-011-1/+1
* | | | | | | | Merge pull request #12271 from nextcloud/prevent-upload-cancelMorris Jobke2018-11-051-5/+24
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Ask before cancelling an ongoing uploadJohn Molakvoæ (skjnldsv)2018-11-051-5/+24
* | | | | | | | Merge pull request #12185 from nextcloud/cleanup/dicontainerMorris Jobke2018-11-058-70/+39
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix files_sharingRoeland Jago Douma2018-11-021-1/+2
| * | | | | | | Properly query the methodreflectorRoeland Jago Douma2018-11-022-2/+3
| * | | | | | | Fix testsRoeland Jago Douma2018-11-025-31/+21
| * | | | | | | The identityproof manager should be in ServerRoeland Jago Douma2018-11-022-8/+8
| * | | | | | | No need to register it also in the DI ContainerRoeland Jago Douma2018-11-021-4/+0
| * | | | | | | The Encryption manager belongs in Server.phpRoeland Jago Douma2018-11-022-5/+2
| * | | | | | | SearchResult should be difined in Server as it is a core componentRoeland Jago Douma2018-11-022-5/+1
| * | | | | | | The UserSession is constructed in the serverRoeland Jago Douma2018-11-022-4/+3
| * | | | | | | TimeFactory is already regsitsered in the Server ContainerRoeland Jago Douma2018-11-021-3/+0
| * | | | | | | Request is already regsitered in the Server containerRoeland Jago Douma2018-11-021-5/+0
| * | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |