summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Better design for core search, fixes and style to scssJohn Molakvoæ (skjnldsv)2018-06-197-134/+134
* Merge pull request #9919 from nextcloud/immutable-groupsJohn Molakvoæ2018-06-1910-21/+113
|\
| * New user support, provisionning api and design fixesJohn Molakvoæ (skjnldsv)2018-06-197-20/+65
| * Don't pretend we can add/remove users to/from groups when we can'tRobin Appelman2018-06-196-4/+51
* | Merge pull request #9920 from nextcloud/fix/9867/fix_setup_checkMorris Jobke2018-06-192-4/+18
|\ \ | |/ |/|
| * Fix testsMorris Jobke2018-06-191-3/+7
| * If cronErros is empty json_decode will return NULLRoeland Jago Douma2018-06-191-1/+11
|/
* Merge pull request #9830 from nextcloud/feature/noid/oauth_vue_redirect_validateMorris Jobke2018-06-1918-151/+6136
|\
| * Fix redirctUriRoeland Jago Douma2018-06-191-4/+4
| * js-src => srcRoeland Jago Douma2018-06-198-4/+4
| * Fix AdminTestsRoeland Jago Douma2018-06-192-33/+5
| * Cleanup ControllerRoeland Jago Douma2018-06-192-13/+1
| * Fix testsRoeland Jago Douma2018-06-191-17/+65
| * [oauth2] Fix css for admin settingsJulius Härtl2018-06-193-3/+18
| * Migrate OAuth Admin settings to vueRoeland Jago Douma2018-06-1915-88/+6050
* | Merge pull request #9881 from nextcloud/user-db-backend-querybuilderMorris Jobke2018-06-194-13/+48
|\ \
| * | use query builder in all places in the db user backendRobin Appelman2018-06-151-13/+26
| * | Add count to function builderRobin Appelman2018-06-143-0/+22
* | | Merge pull request #9914 from Jaczel/new-settings-grammatical-fixMorris Jobke2018-06-191-2/+2
|\ \ \
| * | | Fixed English grammatical error on Settings page.Jaczel2018-06-191-2/+2
| | |/ | |/|
* | | Merge pull request #9904 from nextcloud/dependabot/npm_and_yarn/apps/updateno...Roeland Jago Douma2018-06-192-4/+4
|\ \ \
| * | | Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/updatenotificationdependabot[bot]2018-06-192-4/+4
|/ / /
* | | Merge pull request #9906 from nextcloud/dependabot/npm_and_yarn/settings/webp...Roeland Jago Douma2018-06-192-7/+7
|\ \ \ | |/ / |/| |
| * | Bump webpack-cli from 3.0.3 to 3.0.8 in /settingsdependabot[bot]2018-06-192-7/+7
|/ /
* | Merge pull request #9903 from nextcloud/dependabot/npm_and_yarn/settings/webp...Roeland Jago Douma2018-06-192-4/+4
|\ \
| * | Bump webpack-merge from 4.1.2 to 4.1.3 in /settingsdependabot[bot]2018-06-192-4/+4
* | | Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providersblizzz2018-06-1922-111/+2309
|\ \ \ | |/ / |/| |
| * | CommentsRoeland Jago Douma2018-06-195-6/+20
| * | Add getProvider helper functionRoeland Jago Douma2018-06-181-35/+17
| * | Use constant for token versionRoeland Jago Douma2018-06-189-20/+27
| * | Add more testsRoeland Jago Douma2018-06-187-34/+506
| * | Generate the new publicKey tokens by default!Roeland Jago Douma2018-06-181-2/+1
| * | Actually convert the tokenRoeland Jago Douma2018-06-183-40/+94
| * | Add publickey provider to managerRoeland Jago Douma2018-06-181-47/+52
| * | SetPassword on PublicKeyTokensRoeland Jago Douma2018-06-183-14/+31
| * | Just pass uid to the Token stuffRoeland Jago Douma2018-06-189-97/+34
| * | Add first testsRoeland Jago Douma2018-06-184-1/+785
| * | Initial PKT implementationRoeland Jago Douma2018-06-188-11/+678
| * | Add new authtoken v2 columns to the authtoken tableRoeland Jago Douma2018-06-184-1/+57
| * | Abstract the Provider via a managerRoeland Jago Douma2018-06-184-9/+213
* | | Merge pull request #9905 from nextcloud/dependabot/npm_and_yarn/settings/v-to...Julius Härtl2018-06-194-6/+6
|\ \ \
| * | | Bump compilationJohn Molakvoæ (skjnldsv)2018-06-192-2/+2
| * | | Bump v-tooltip from 2.0.0-rc.32 to 2.0.0-rc.33 in /settingsdependabot[bot]2018-06-182-4/+4
| |/ /
* | | Merge pull request #9902 from nextcloud/dependabot/npm_and_yarn/apps/updateno...Julius Härtl2018-06-192-14/+19
|\ \ \
| * | | Bump webpack-cli from 3.0.3 to 3.0.8 in /apps/updatenotificationdependabot[bot]2018-06-182-14/+19
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2018-06-19244-498/+672
|/ /
* | Merge pull request #9893 from kevgathuku/update-unshare-messageJulius Härtl2018-06-181-1/+1
|\ \
| * | Update message shown when unsharing a fileKevin Ndung'u2018-06-181-1/+1
* | | Merge pull request #9884 from nextcloud/groups-search-use-proper-keysJulius Härtl2018-06-183-10/+11
|\ \ \
| * | | Tests fixJohn Molakvoæ (skjnldsv)2018-06-151-5/+5
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 20:06:54 +0000