summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16055 from nextcloud/design/native-fontsJan-Christoph Borchardt2019-06-2637-140/+43
|\
| * Use native font stackJan-Christoph Borchardt2019-06-247-299/+6
| * Move font from Nunito to Noto SansJan-Christoph Borchardt2019-06-2236-113/+309
* | Merge pull request #16021 from nextcloud/bugfix/noid/fall-back-to-black-for-n...Roeland Jago Douma2019-06-252-0/+6
|\ \
| * | Fall back to black for non-color valuesJoas Schilling2019-06-202-0/+6
* | | Merge pull request #16027 from nextcloud/bugfix/noid/check-if-uploading-is-en...Roeland Jago Douma2019-06-251-1/+3
|\ \ \
| * | | Check if uploading to lookup server is enabled before verifyingJoas Schilling2019-06-211-1/+3
* | | | Merge pull request #15832 from nextcloud/bugfix/noid/fulltext-search-groupfol...Roeland Jago Douma2019-06-252-2/+5
|\ \ \ \
| * | | | Fix full text search for groupfoldersMorris Jobke2019-06-172-2/+5
* | | | | Merge pull request #15956 from nextcloud/bugfix/noid/fix_checkapp_occRoeland Jago Douma2019-06-251-2/+2
|\ \ \ \ \
| * | | | | Fix appid argument for integrity:check-appGeorg Ehrke2019-06-251-2/+2
* | | | | | Merge pull request #15970 from nextcloud/dependabot/npm_and_yarn/css-loader-3...Roeland Jago Douma2019-06-2531-89/+98
|\ \ \ \ \ \
| * | | | | | Bump css-loader from 2.1.1 to 3.0.0dependabot-preview[bot]2019-06-2531-89/+98
|/ / / / / /
* | | | | | Merge pull request #16013 from nextcloud/versions-preview-string-idRoeland Jago Douma2019-06-256-6/+6
|\ \ \ \ \ \
| * | | | | | fix previews and rollback of versions with non numeric version idsRobin Appelman2019-06-196-6/+6
* | | | | | | Merge pull request #15870 from nextcloud/preview-provider-v2Roeland Jago Douma2019-06-2536-138/+353
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add new Provider interface for preview providersRobin Appelman2019-06-1736-138/+353
* | | | | | | Merge pull request #15971 from nextcloud/dependabot/npm_and_yarn/tests/ui-reg...Roeland Jago Douma2019-06-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update pixelmatch requirement in /tests/ui-regressiondependabot-preview[bot]2019-06-161-1/+1
* | | | | | | | Merge pull request #16024 from nextcloud/bugfix/15944/fix-return-code-user-pr...Roeland Jago Douma2019-06-251-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Forward OCSException to initiatorDaniel Kesselberg2019-06-201-1/+8
* | | | | | | | | Merge pull request #15777 from nextcloud/feature/ocp-event-dispatcherRoeland Jago Douma2019-06-2537-123/+524
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add event dispatcher to OCPChristoph Wurst2019-06-2537-123/+524
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2518-24/+152
* | | | | | | | | Merge pull request #16043 from nextcloud/dependabot/npm_and_yarn/dompurify-1....Roeland Jago Douma2019-06-246-21/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump dompurify from 1.0.10 to 1.0.11dependabot-preview[bot]2019-06-246-21/+21
|/ / / / / / / / /
* | | | | | | | | Merge pull request #16044 from nextcloud/dependabot/npm_and_yarn/webpack-4.35.0Roeland Jago Douma2019-06-242-10/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump webpack from 4.34.0 to 4.35.0dependabot-preview[bot]2019-06-232-10/+30
* | | | | | | | | | Merge pull request #15888 from nextcloud/dav-write-forward-exceptionRobin Appelman2019-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | log inner exception during dav writeRobin Appelman2019-06-061-1/+1
* | | | | | | | | | | Merge pull request #16033 from nextcloud/fix/noid/ldap-group-wiz-selectionblizzz2019-06-243-44/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixes LDAP Wizard forgetting groups on select with searchArthur Schiwon2019-06-213-44/+32
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2420-6/+126
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2318-2/+24
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | changes the returned key from UserID to id, in accordance with getUserData (#...John Molakvoæ2019-06-225-13/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changes the returned key from UserID to id, in accordance with getUserDataArthur Schiwon2019-06-215-13/+13
| |/ / / / / / / / /
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-222-0/+872
* | | | | | | | | | Merge pull request #15997 from nextcloud/design/sidebar-iconJan-Christoph Borchardt2019-06-212-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add sidebar icon we use in Talk and Viewer alreadyJan-Christoph Borchardt2019-06-182-1/+3
* | | | | | | | | | | Merge pull request #15889 from nextcloud/touch-handle-backend-exceptionsRobin Appelman2019-06-212-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix testsRobin Appelman2019-06-211-0/+3
| * | | | | | | | | | handle storage exceptions when trying to set mtimeRobin Appelman2019-06-061-1/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #15540 from nextcloud/bugfix/noid/prevent-faulty-logs-from...Joas Schilling2019-06-211-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prevent faulty logs from nested setupFS callsJoas Schilling2019-05-151-2/+3
* | | | | | | | | | | Merge pull request #15964 from nextcloud/enh/noid/user-creation-optionsblizzz2019-06-2113-24/+235
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | uses "yes" and "no" for config switch over stringified numbersArthur Schiwon2019-06-213-7/+7
| * | | | | | | | | | rebuilt js files after rebaseArthur Schiwon2019-06-202-5/+5
| * | | | | | | | | | makes users management page aware of the introduced optionsArthur Schiwon2019-06-197-11/+16
| * | | | | | | | | | ensures mapping of chosen useridArthur Schiwon2019-06-194-6/+39
| * | | | | | | | | | extends Provisioning API with optional userid and required emailArthur Schiwon2019-06-192-6/+179