summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12261 from ↵Roeland Jago Douma2018-11-053-38/+37
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.1 Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility
| * Rebuild assetsRoeland Jago Douma2018-11-051-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibilitydependabot[bot]2018-11-052-37/+36
| | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #12265 from nextcloud/dav-bumpRoeland Jago Douma2018-11-052-7/+9
|\ \ | | | | | | bump dav version for migration
| * | bump dav version for migrationJohn Molakvoæ (skjnldsv)2018-11-052-7/+9
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2John Molakvoæ2018-11-051-0/+4
|\ \ \ | | | | | | | | make twofactor .button inline-block
| * | | make twofactor .button inlin-blockJonas Sulzer2018-11-041-0/+4
| |/ / | | | | | | | | | | | | | | | fixes #3752 Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | | Merge pull request #12266 from nextcloud/bump/npm/settingsRoeland Jago Douma2018-11-058-195/+408
|\ \ \ | | | | | | | | Bump npm deps: settings
| * | | Bump npm deps: settingsRoeland Jago Douma2018-11-058-195/+408
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #12252 from nextcloud/theming-advanced-h3Roeland Jago Douma2018-11-051-1/+1
|\ \ \ \ | | | | | | | | | | Change "Advanced options" to h3
| * | | | Change "Advanced options" to h3Marius Blüm2018-11-041-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | Merge pull request #12263 from ↵Roeland Jago Douma2018-11-052-101/+101
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.24.0 Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
| * | | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2dependabot[bot]2018-11-052-101/+101
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12264 from ↵Roeland Jago Douma2018-11-052-29/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.1 Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
| * | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2dependabot[bot]2018-11-052-29/+36
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12254 from ↵Roeland Jago Douma2018-11-052-29/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-1.0.1 Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
| * | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotificationdependabot[bot]2018-11-052-29/+36
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12255 from ↵Roeland Jago Douma2018-11-052-101/+101
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.24.0 Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
| * | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotificationdependabot[bot]2018-11-052-101/+101
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12257 from ↵dependabot[bot]2018-11-052-13/+40
|\ \ \ \ | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/nextcloud-vue-0.3.1
| * | | | Bump nextcloud-vue from 0.2.0 to 0.3.1 in /settingsdependabot[bot]2018-11-052-13/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [nextcloud-vue](https://github.com/nextcloud/vue-components) from 0.2.0 to 0.3.1. - [Release notes](https://github.com/nextcloud/vue-components/releases) - [Commits](https://github.com/nextcloud/vue-components/compare/v0.2.0...v0.3.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_renderRoeland Jago Douma2018-11-051-1/+1
|\ \ \ \ | |_|/ / |/| | | Set the filemodel before rending the detailsview
| * | | Set the filemodel before rending the detailsviewRoeland Jago Douma2018-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #10934 Else it triggers the rendering two times. Resulting is weird state in for example the comments. Because the comments for OLD_FILEID are retrieved but then the model is changed to NEW_FILEID. But the old comments still get in and get parsed. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [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
|\ \ \ | | | | | | | | Shares are displayed to users with resharing rights
| * | | revert testsMaxence Lange2018-11-022-11/+11
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | user can have his resharing rights revoked, yet seeing created sharesMaxence Lange2018-11-022-10/+19
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | check parents resharing rightsMaxence Lange2018-11-021-6/+14
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | Use property to check if a share entry is shared with the current userJulius Härtl2018-11-023-13/+17
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add uid_owner to enable permission settings on the viewsJulius Härtl2018-11-021-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Remove reshare owner entry from the share listJulius Härtl2018-11-021-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Show share settings for owner and reshare owners onlyJulius Härtl2018-11-024-7/+33
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | limit to circles moderatorMaxence Lange2018-11-021-1/+2
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | display shares to circles moderatorMaxence Lange2018-11-021-0/+22
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | shares are displayed to users with resharing rightsMaxence Lange2018-11-022-11/+49
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelockRoeland Jago Douma2018-11-043-20/+13
|\ \ \ \ | |_|_|/ |/| | | Do not log FileLock as exception
| * | | Fix testsRoeland Jago Douma2018-11-042-20/+10
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Do not log FileLock as exceptionRoeland Jago Douma2018-11-041-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | There is no reason to log FileLock errors as exceptions to the log file. Locks happen for very legit reasons and it is actually a sign of the code doing its job. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [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 header
| * | | Fix app menu calculation for random size of the right headerJulius Härtl2018-11-022-4/+9
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2018-11-0388-132/+198
| |_|/ |/| |
* | | Merge pull request #12071 from nextcloud/addressbook-uid-check-migrationRoeland Jago Douma2018-11-0210-23/+371
|\ \ \ | | | | | | | | Addressbook uid check migration
| * | | Phpunit fixJohn Molakvoæ (skjnldsv)2018-11-022-25/+36
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Merge branch 'addressbook-uid-check-migration' of ↵John Molakvoæ (skjnldsv)2018-11-01265-1029/+7485
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/nextcloud/server into addressbook-uid-check-migration Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | | Update PHPDoc to reflect the actual behaviourMorris Jobke2018-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| | * | | move migrationJohn Molakvoæ (skjnldsv)2018-11-018-102/+84
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | | Create cards if noneJohn Molakvoæ (skjnldsv)2018-11-011-5/+45
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | | Properly set uid and create and updateJohn Molakvoæ (skjnldsv)2018-11-011-3/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | | TestsJohn Molakvoæ (skjnldsv)2018-11-012-1/+122
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 20:56:44 +0000