mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
44,320 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

44320 Commits

Author SHA1 Message Date
Morris Jobke c3aea9cdf6
Merge pull request #9830 from nextcloud/feature/noid/oauth_vue_redirect_validate 
Migrate OAuth Admin settings to vue
 2018-06-19 14:50:03 +02:00
Morris Jobke 18e9631810
Wait for cron to finish before running upgrade command 
* fixes #9562

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-19 14:22:45 +02:00
Robin Appelman 3392302d22
make table name configurable for db user backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-19 14:14:44 +02:00
Morris Jobke 8646f01320
Merge pull request #9881 from nextcloud/user-db-backend-querybuilder 
use query builder in all places in the db user backend
 2018-06-19 14:12:22 +02:00
Morris Jobke 1d65e44dae
Merge pull request #9914 from Jaczel/new-settings-grammatical-fix 
Fixed English grammatical error on Settings page - template
 2018-06-19 13:12:47 +02:00
Roeland Jago Douma bb0ff54d82
Merge pull request #9904 from 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
 2018-06-19 13:05:24 +02:00
Jaczel 7672716ccf Fixed English grammatical error on Settings page. 2018-06-19 20:30:49 +10:00
dependabot[bot] 9ebf4eaff6
Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/updatenotification 
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>
 2018-06-19 10:11:36 +00:00
Roeland Jago Douma b5616578df
Merge pull request #9906 from nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-3.0.8 
Bump webpack-cli from 3.0.3 to 3.0.8 in /settings
 2018-06-19 12:08:17 +02:00
Roeland Jago Douma f520a6bceb
Fix redirctUri 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 11:42:42 +02:00
Roeland Jago Douma 1ff3f57898
js-src => src 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 11:42:41 +02:00
Roeland Jago Douma 27259ea2a2
Fix AdminTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 11:42:41 +02:00
Roeland Jago Douma 1ccb36a0f1
Cleanup Controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 11:42:41 +02:00
Roeland Jago Douma b6182489be
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 11:42:41 +02:00
Julius Härtl 976f478a98
[oauth2] Fix css for admin settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-19 11:42:41 +02:00
Roeland Jago Douma d2d1e8e375
Migrate OAuth Admin settings to vue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 11:42:41 +02:00
dependabot[bot] c00380f2b0
Bump webpack-cli from 3.0.3 to 3.0.8 in /settings 
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>
 2018-06-19 09:38:42 +00:00
Roeland Jago Douma 7b8063a242
Merge pull request #9903 from nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.1.3 
Bump webpack-merge from 4.1.2 to 4.1.3 in /settings
 2018-06-19 11:36:55 +02:00
blizzz 7ef722e7a6
Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providers 
Add new public key token provider (tokens survive password change)
 2018-06-19 10:11:09 +02:00
dependabot[bot] 9a247a77d4
Bump webpack-merge from 4.1.2 to 4.1.3 in /settings 
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>
 2018-06-19 07:54:40 +00:00
Julius Härtl b8492c6944
Merge pull request #9905 from 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
 2018-06-19 09:53:49 +02:00
Julius Härtl babad50875
Merge pull request #9902 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.0.8 
Bump webpack-cli from 3.0.3 to 3.0.8 in /apps/updatenotification
 2018-06-19 09:51:19 +02:00
Roeland Jago Douma 82959ca93e
Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 07:46:43 +02:00
John Molakvoæ (skjnldsv) 9546e939fb
Bump compilation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-19 06:38:26 +02:00
Nextcloud bot b8c728de6d
[tx-robot] updated from transifex 2018-06-19 00:12:55 +00:00
dependabot[bot] 1a9faa5320
Bump v-tooltip from 2.0.0-rc.32 to 2.0.0-rc.33 in /settings 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0-rc.32 to 2.0.0-rc.33.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-06-18 22:13:54 +00:00
dependabot[bot] 255fbe0ee8
Bump webpack-cli from 3.0.3 to 3.0.8 in /apps/updatenotification 
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>
 2018-06-18 22:13:19 +00:00
Roeland Jago Douma 970dea9264
Add getProvider helper function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma df34571d1d
Use constant for token version 
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>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma 9e7a95fe58
Add more tests 
* Add a lot of tests
* Fixes related to those tests
* Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma 1999f7ce7b
Generate the new publicKey tokens by default! 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma f168ecfa7a
Actually convert the token 
* 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>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma d03d16a936
Add publickey provider to manager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma 4bbc21cb21
SetPassword on PublicKeyTokens 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma 4c0d710479
Just pass uid to the Token stuff 
We don't have user objects in the code everywhere

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma 1f17010e0b
Add first tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma 02e0af1287
Initial PKT implementation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma 8eec3a9c9a
Add new authtoken v2 columns to the authtoken table 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma 3dd5f3d5f6
Abstract the Provider via a manager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:53 +02:00
Julius Härtl 5b60508af4
Merge pull request #9893 from kevgathuku/update-unshare-message 
Update message shown when unsharing a file
 2018-06-18 16:44:54 +02:00
Julius Härtl 6b6c43bf79
Merge pull request #9884 from nextcloud/groups-search-use-proper-keys 
Add search to users details groups
 2018-06-18 16:43:06 +02:00
blizzz 60adc92eb5
Merge pull request #9823 from nextcloud/bufgix/noid/update_token_on_session_id_regenerate 
Update the token on session regeneration
 2018-06-18 13:25:18 +02:00
Kevin Ndung'u 5d9c1d3fea
Update message shown when unsharing a file 
Signed-off-by: Kevin Ndung'u <kevgathuku@gmail.com>
 2018-06-18 13:12:23 +03:00
John Molakvoæ 0ad1f19a74
Merge pull request #9717 from nextcloud/feature/actions-menu 
New Feature/actions file menu
 2018-06-18 08:01:52 +02:00
Abijeet 419d72e0ee
Adds a test case for the loading symbol in deleted files. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-18 07:39:44 +02:00
Abijeet 55216e6b95
Fixes the restore loading icon appearing continuously. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-18 07:39:44 +02:00
Abijeet 470310b3bf
Fixes issue with action being displayed incorrectly. 
Also fixes the issue with the loading icon on copy & move.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-18 07:39:44 +02:00
Morris Jobke 57b649d665
Fix alignment of more icon 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-18 07:39:44 +02:00
Abijeet 5d95911537
Fixes UI issues with the design, 
1. Removes an unnecessary width
2. Content of the table header moving down on selection. Happening due to increase in height of header.
3. Invalid font-size for the actions menu.
4. Vertical position of the action menu

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-18 07:39:44 +02:00
Abijeet 0c77b93b86
Fixes issues found during running of test cases. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-18 07:39:44 +02:00