summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-12-1744-84/+86
* Merge pull request #18430 from nextcloud/fix/noid/double-flowRoeland Jago Douma2019-12-162-2/+2
|\
| * lower to debug, since we fire two events, so it is legitimateArthur Schiwon2019-12-161-1/+1
| * do not add (user) flows twiceArthur Schiwon2019-12-161-1/+1
* | Merge pull request #18431 from nextcloud/prov-api-query-applicationRoeland Jago Douma2019-12-161-1/+1
|\ \
| * | query FederatedFileSharing Application instead of creating itRobin Appelman2019-12-161-1/+1
* | | Cleanup old log and fix share icon sidebar opening in breadcru… (#18425)John Molakvoæ2019-12-164-6/+5
|\ \ \
| * | | Cleanup old log and fix share icon sidebar opening in breadcrumbsJohn Molakvoæ (skjnldsv)2019-12-164-6/+5
* | | | Merge pull request #18418 from nextcloud/dependachristoph/npm_and_yarn/serial...Roeland Jago Douma2019-12-1637-76/+76
|\ \ \ \
| * | | | Bump serialize-javascript to v2.1.2Christoph Wurst2019-12-1637-76/+76
| |/ / /
* | | | Merge pull request #18061 from nextcloud/bugfix/noid/dav-plugin-oldRoeland Jago Douma2019-12-164-5/+27
|\ \ \ \
| * | | | Load apps dav plugins on the old webdav routeJulius Härtl2019-12-044-5/+27
* | | | | Merge pull request #17018 from nextcloud/feature/noid/allow-to-force-enable-v...Joas Schilling2019-12-168-42/+83
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow to force enable apps via CLIJoas Schilling2019-12-138-42/+83
* | | | | Merge pull request #18417 from nextcloud/fix/transfer-ownership-ui-emailRoeland Jago Douma2019-12-163-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make it possible to find transfer user by emailChristoph Wurst2019-12-163-2/+4
* | | | | Merge pull request #18384 from nextcloud/fix/18255/global_config_to_always_ac...Roeland Jago Douma2019-12-1611-61/+211
|\ \ \ \ \
| * | | | | config.php setting to always accept internal sharesRoeland Jago Douma2019-12-1611-61/+211
* | | | | | Merge pull request #18407 from nextcloud/dependabot/npm_and_yarn/css-loader-3...Roeland Jago Douma2019-12-1642-60/+60
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Bump css-loader from 3.2.1 to 3.3.2dependabot-preview[bot]2019-12-1642-60/+60
|/ / / / /
* | | | | Merge pull request #18401 from nextcloud/rakekniven-patch-1Roeland Jago Douma2019-12-161-1/+1
|\ \ \ \ \
| * | | | | l10n. Change grammar.rakekniven2019-12-131-1/+1
* | | | | | Merge pull request #18408 from nextcloud/dependabot/npm_and_yarn/eslint-plugi...Roeland Jago Douma2019-12-162-44/+66
|\ \ \ \ \ \
| * | | | | | Bump eslint-plugin-import from 2.18.2 to 2.19.1dependabot-preview[bot]2019-12-152-44/+66
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-1610-4/+32
* | | | | | | Merge pull request #18410 from nextcloud/dependabot/npm_and_yarn/url-search-p...dependabot-preview[bot]2019-12-153-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Bump url-search-params-polyfill from 7.0.0 to 7.0.1dependabot-preview[bot]2019-12-153-5/+5
| |/ / / / / /
* / / / / / / [tx-robot] updated from transifexNextcloud bot2019-12-1520-18/+178
|/ / / / / /
* / / / / / [tx-robot] updated from transifexNextcloud bot2019-12-1442-0/+424
|/ / / / /
* | | | | Merge pull request #17494 from nextcloud/fix/16340/ignore-invalid-jsonblizzz2019-12-133-14/+29
|\ \ \ \ \
| * | | | | Log critical fallback to user default if we can't parse the JSONChristoph Wurst2019-12-133-15/+27
| * | | | | Return a default user record if json is brokenDaniel Kesselberg2019-12-131-0/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #18302 from mwegrzynek/patch-1blizzz2019-12-131-5/+5
|\ \ \ \ \
| * | | | | Fix comments search result to work with multibyte stringsMichał Węgrzynek2019-12-091-5/+5
* | | | | | Merge pull request #18359 from nextcloud/fix/18271/dismiss_transfer_ownership...blizzz2019-12-131-2/+49
|\ \ \ \ \ \
| * | | | | | Dismiss transferownership notification cancels transferRoeland Jago Douma2019-12-111-2/+49
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #18351 from nextcloud/enhancement/typed-filesystem-eventsblizzz2019-12-1315-52/+511
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add typed events for the filesystem/scannerChristoph Wurst2019-12-1315-52/+511
|/ / / / /
* | | / / [tx-robot] updated from transifexNextcloud bot2019-12-13128-1028/+544
| |_|/ / |/| | |
* | | | Merge pull request #17784 from nextcloud/enh/disable-clear-site-data-via-configRoeland Jago Douma2019-12-122-2/+34
|\ \ \ \
| * | | | Send Clear-Site-Data expect for ChromeDaniel Kesselberg2019-11-302-2/+34
* | | | | Merge pull request #18378 from nextcloud/wiswedel/stringPolishing/shareSettingsRoeland Jago Douma2019-12-121-1/+1
|\ \ \ \ \
| * | | | | removed unclear wording "non-link shares"Sascha Wiswedel2019-12-121-1/+1
* | | | | | Merge pull request #18372 from nextcloud/wiswedel/stringPolishing/shareDefaul...Roeland Jago Douma2019-12-121-1/+1
|\ \ \ \ \ \
| * | | | | | clarified default permission setting stringSascha Wiswedel2019-12-121-1/+1
| |/ / / / /
* | | | | | Merge pull request #17239 from nextcloud/feature/17208/Move_usersmanagement_t...Greta2019-12-1224-419/+11692
|\ \ \ \ \ \
| * | | | | | Move users management to multi lineGreta Doci2019-12-1224-419/+11692
* | | | | | | Merge pull request #18365 from nextcloud/bump/crlRoeland Jago Douma2019-12-121-16/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Bump the CRLRoeland Jago Douma2019-12-121-16/+18
* | | | | | | Merge pull request #18343 from nextcloud/version/18/beta2v18.0.0beta2Roeland Jago Douma2019-12-121-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |