summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-06-20184-254/+314
|
* Merge pull request #9912 from nextcloud/search-standardJohn Molakvoæ2018-06-2017-531/+718
|\ | | | | New search standard and user search
| * Apps searchJohn Molakvoæ (skjnldsv)2018-06-193-43/+20
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Debounce search and resetJohn Molakvoæ (skjnldsv)2018-06-191-4/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Run vue builds in parallelMorris Jobke2018-06-191-3/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fit user search to new standardJohn Molakvoæ (skjnldsv)2018-06-194-3815/+33
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Added new search standardJohn Molakvoæ (skjnldsv)2018-06-195-376/+543
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Add user search supportJohn Molakvoæ (skjnldsv)2018-06-193-3/+3827
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Better design for core search, fixes and style to scssJohn Molakvoæ (skjnldsv)2018-06-197-134/+134
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #9919 from nextcloud/immutable-groupsJohn Molakvoæ2018-06-1910-21/+113
|\ | | | | Don't pretend we can add/remove users to/from groups when we can't
| * New user support, provisionning api and design fixesJohn Molakvoæ (skjnldsv)2018-06-197-20/+65
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Don't pretend we can add/remove users to/from groups when we can'tRobin Appelman2018-06-196-4/+51
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #9920 from nextcloud/fix/9867/fix_setup_checkMorris Jobke2018-06-192-4/+18
|\ \ | |/ |/| If cronErros is empty json_decode will return NULL
| * Fix testsMorris Jobke2018-06-191-3/+7
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * If cronErros is empty json_decode will return NULLRoeland Jago Douma2018-06-191-1/+11
|/ | | | | | Fixes #9867 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #9830 from nextcloud/feature/noid/oauth_vue_redirect_validateMorris Jobke2018-06-1918-151/+6136
|\ | | | | Migrate OAuth Admin settings to vue
| * Fix redirctUriRoeland Jago Douma2018-06-191-4/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * js-src => srcRoeland Jago Douma2018-06-198-4/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix AdminTestsRoeland Jago Douma2018-06-192-33/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Cleanup ControllerRoeland Jago Douma2018-06-192-13/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix testsRoeland Jago Douma2018-06-191-17/+65
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [oauth2] Fix css for admin settingsJulius Härtl2018-06-193-3/+18
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Migrate OAuth Admin settings to vueRoeland Jago Douma2018-06-1915-88/+6050
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | 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 backend
| * | use query builder in all places in the db user backendRobin Appelman2018-06-151-13/+26
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Add count to function builderRobin Appelman2018-06-143-0/+22
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #9914 from Jaczel/new-settings-grammatical-fixMorris Jobke2018-06-191-2/+2
|\ \ \ | | | | | | | | Fixed English grammatical error on Settings page - template
| * | | Fixed English grammatical error on Settings page.Jaczel2018-06-191-2/+2
| | |/ | |/|
* | | Merge pull request #9904 from ↵Roeland Jago Douma2018-06-192-4/+4
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-merge-4.1.3 Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/updatenotification
| * | | Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/updatenotificationdependabot[bot]2018-06-192-4/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.2...v4.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #9906 from ↵Roeland Jago Douma2018-06-192-7/+7
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-3.0.8 Bump webpack-cli from 3.0.3 to 3.0.8 in /settings
| * | Bump webpack-cli from 3.0.3 to 3.0.8 in /settingsdependabot[bot]2018-06-192-7/+7
|/ / | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.0.3 to 3.0.8. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.0.3...v3.0.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #9903 from ↵Roeland Jago Douma2018-06-192-4/+4
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.1.3 Bump webpack-merge from 4.1.2 to 4.1.3 in /settings
| * | Bump webpack-merge from 4.1.2 to 4.1.3 in /settingsdependabot[bot]2018-06-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.2...v4.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providersblizzz2018-06-1922-111/+2309
|\ \ \ | |/ / |/| | Add new public key token provider (tokens survive password change)
| * | CommentsRoeland Jago Douma2018-06-195-6/+20
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add getProvider helper functionRoeland Jago Douma2018-06-181-35/+17
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Use constant for token versionRoeland Jago Douma2018-06-189-20/+27
| | | | | | | | | | | | | | | | | | | | | And don't set the version in the constructor. That would possible cause to many updates. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add more testsRoeland Jago Douma2018-06-187-34/+506
| | | | | | | | | | | | | | | | | | | | | | | | * Add a lot of tests * Fixes related to those tests * Fix tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Generate the new publicKey tokens by default!Roeland Jago Douma2018-06-181-2/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Actually convert the tokenRoeland Jago Douma2018-06-183-40/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When getting the token * When rotating the token * Also store the encrypted password as base64 to avoid weird binary stuff Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add publickey provider to managerRoeland Jago Douma2018-06-181-47/+52
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | SetPassword on PublicKeyTokensRoeland Jago Douma2018-06-183-14/+31
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Just pass uid to the Token stuffRoeland Jago Douma2018-06-189-97/+34
| | | | | | | | | | | | | | | | | | We don't have user objects in the code everywhere Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add first testsRoeland Jago Douma2018-06-184-1/+785
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Initial PKT implementationRoeland Jago Douma2018-06-188-11/+678
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add new authtoken v2 columns to the authtoken tableRoeland Jago Douma2018-06-184-1/+57
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Abstract the Provider via a managerRoeland Jago Douma2018-06-184-9/+213
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9905 from ↵Julius Härtl2018-06-194-6/+6
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/v-tooltip-2.0.0-rc.33 Bump v-tooltip from 2.0.0-rc.32 to 2.0.0-rc.33 in /settings
| * | | Bump compilationJohn Molakvoæ (skjnldsv)2018-06-192-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 14:53:31 +0000