summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move to escape-htmlRoeland Jago Douma2019-10-0414-148/+115
* Merge pull request #17357 from nextcloud/enh/oauth/no_oc_bindingRoeland Jago Douma2019-10-043-2/+19
|\
| * fixup! Import routerRoeland Jago Douma2019-10-033-1/+17
| * Import routerRoeland Jago Douma2019-10-031-2/+3
* | Merge pull request #17359 from nextcloud/bugfix/noid/dont-call-basename-on-nullRoeland Jago Douma2019-10-041-1/+1
|\ \
| * | Don't call basename on nullJoas Schilling2019-10-011-1/+1
* | | Use same settings for mail share as link shares (#16629)John Molakvoæ2019-10-041-70/+63
|\ \ \
| * | | Prevent non owners to update others link sharesJohn Molakvoæ (skjnldsv)2019-10-041-50/+50
| * | | Use same settings for mail share as link sharesJohn Molakvoæ (skjnldsv)2019-10-041-20/+13
|/ / /
* | | Fix master testing and update eslint-config (#17367)John Molakvoæ2019-10-0436-74/+225
|\ \ \
| * | | Fix tag acceptance tests after #16682John Molakvoæ (skjnldsv)2019-10-042-3/+19
| * | | Split drone webpack testsJohn Molakvoæ (skjnldsv)2019-10-0431-76/+183
| * | | Fix master testing and update eslint-configJohn Molakvoæ (skjnldsv)2019-10-046-23/+51
* | | | Add Fatal logging option (#17363)John Molakvoæ2019-10-042-2/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Add Fatal logging optionTim Terhorst2019-10-022-2/+8
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-04134-1076/+1092
* | | | Merge pull request #17388 from nextcloud/fix/undefined_index/loginflowv2Roeland Jago Douma2019-10-031-2/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't use an undefined index if not neededRoeland Jago Douma2019-10-031-2/+0
|/ / /
* | | Remove users management settings cleaning leftovers (#17360)John Molakvoæ2019-10-0310-1252/+1
|\ \ \ | |/ / |/| |
| * | Remove users management settings cleaning leftoversJohn Molakvoæ (skjnldsv)2019-10-0110-1252/+1
| |/
* | [tx-robot] updated from transifexNextcloud bot2019-10-0324-4/+28
* | Merge pull request #17002 from nextcloud/fix/noid/ldap-dont-process-known-avasblizzz2019-10-022-2/+113
|\ \
| * | Don't process known avatars from LDAPArthur Schiwon2019-09-042-2/+113
* | | Merge pull request #17366 from nextcloud/fix/usersIngroupRoeland Jago Douma2019-10-021-3/+8
|\ \ \
| * | | Fix DB usersInGroups fetchingRoeland Jago Douma2019-10-021-3/+8
* | | | Merge pull request #17350 from nextcloud/adjust-fontsizeJohn Molakvoæ2019-10-022-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Bring the font size down to 14pxMarco Ambrosini2019-10-012-4/+4
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-02204-4216/+4346
| |_|/ |/| |
* | | Merge pull request #17263 from nextcloud/enhancement/eslintJoas Schilling2019-10-01242-10612/+13668
|\ \ \
| * | | Comply to eslintJohn Molakvoæ (skjnldsv)2019-10-01239-10410/+12266
| * | | Use eslintJohn Molakvoæ (skjnldsv)2019-10-015-203/+1403
* | | | Merge pull request #17353 from nextcloud/bugfix/noid/fix-wich-typoJoas Schilling2019-10-011-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in "which"Joas Schilling2019-10-011-1/+1
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2019-10-01174-15854/+16144
* | | Merge pull request #17336 from nextcloud/dependabot/npm_and_yarn/build/handle...Roeland Jago Douma2019-10-012-7/+7
|\ \ \
| * | | Bump handlebars from 4.2.1 to 4.4.0 in /builddependabot-preview[bot]2019-09-302-7/+7
* | | | Merge pull request #17317 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2019-10-012-15/+96
|\ \ \ \
| * | | | Bump @babel/core from 7.6.0 to 7.6.2dependabot-preview[bot]2019-10-012-15/+96
* | | | | Merge pull request #17001 from nextcloud/fix/noid/addressbookchanges-avatarblizzz2019-10-013-6/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | adjust test expectationsArthur Schiwon2019-09-041-2/+1
| * | | | reduce adressbook change events and handlingArthur Schiwon2019-09-042-4/+6
| | |_|/ | |/| |
* | | | Merge pull request #17320 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2019-10-012-54/+48
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bump @babel/preset-env from 7.6.0 to 7.6.2dependabot-preview[bot]2019-09-292-54/+48
* | | | Use handlebars from node_modules (on CI) (#17340)John Molakvoæ2019-10-012-7/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use handlebars from node_modules (on CI)Christoph Wurst2019-09-302-7/+7
|/ / /
* | | Bump dompurify from 2.0.1 to 2.0.3 (#17318)John Molakvoæ2019-09-3012-16/+16
|\ \ \
| * | | Bump dompurify from 2.0.1 to 2.0.3dependabot-preview[bot]2019-09-3012-16/+16
* | | | Update Bug_report.mdJos Poortvliet2019-09-301-3/+5
|/ / /
* | | Bump webpack from 4.40.2 to 4.41.0 (#17319)John Molakvoæ2019-09-3028-53/+53
|\ \ \ | |/ / |/| |
| * | Bump webpack from 4.40.2 to 4.41.0dependabot-preview[bot]2019-09-2928-53/+53
|/ /