Commit Graph

4702 Commits

Author SHA1 Message Date
Nextcloud bot 1bf486d93f
[tx-robot] updated from transifex 2018-06-28 00:12:20 +00:00
Nextcloud bot 46b62ff579
[tx-robot] updated from transifex 2018-06-27 10:06:12 +00:00
dependabot[bot] 11853855ee
Bump webpack from 4.12.1 to 4.12.2 in /settings
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 07:32:56 +00:00
Nextcloud bot a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
John Molakvoæ (skjnldsv) d3d357fb94
Resend activation email for new users as admin
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-26 09:18:49 +02:00
Joas Schilling 3784ef9fbb
Use a placeholder instead of magic string concatenation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-06-26 08:22:20 +02:00
Morris Jobke 4b8637fa85
Merge pull request #9980 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.12.1
Bump webpack from 4.12.0 to 4.12.1 in /settings
2018-06-26 08:04:32 +02:00
Nextcloud bot 18cf85d264
[tx-robot] updated from transifex 2018-06-26 00:12:07 +00:00
Roeland Jago Douma 3bc3ff38f3
Bump webpack
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-25 20:27:06 +02:00
dependabot[bot] 6595636b2e
Bump webpack from 4.12.0 to 4.12.1 in /settings
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.0 to 4.12.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.0...v4.12.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-25 20:25:37 +02:00
Morris Jobke e3be9efd57
Merge pull request #9970 from nextcloud/users-line-height-fix
Fixed multi line in users list
2018-06-25 15:35:15 +02:00
John Molakvoæ (skjnldsv) ab22ffada5
Css clamp
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-25 14:27:23 +02:00
John Molakvoæ (skjnldsv) 910a431653
Real ellipsis and better line height
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-25 14:08:38 +02:00
John Molakvoæ (skjnldsv) f8f6529653
Fixed multi line in users list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-25 14:08:38 +02:00
Nextcloud bot a431cc3b58
[tx-robot] updated from transifex 2018-06-25 00:11:48 +00:00
Nextcloud bot a4b5ff8420
[tx-robot] updated from transifex 2018-06-24 00:12:06 +00:00
Nextcloud bot 5428cd2f50
[tx-robot] updated from transifex 2018-06-23 00:12:41 +00:00
Morris Jobke 144d1aa29d
Merge pull request #9965 from nextcloud/bugfix/8402/do-not-log-if-user-was-deleted-already
Use info log level to inform about a deleted user and thus the verification is not needed anymore
2018-06-22 14:48:40 +02:00
Morris Jobke dc12f24f73
Use info log level to inform about a deleted user and thus the verification is not needed anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-22 14:11:25 +02:00
John Molakvoæ (skjnldsv) 006deecb00
removed debug
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-22 09:50:17 +02:00
John Molakvoæ (skjnldsv) bd4cba4fb2
Added icons to users list and improved design
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-22 09:48:19 +02:00
Nextcloud bot e4551106f5
[tx-robot] updated from transifex 2018-06-22 00:12:11 +00:00
Nextcloud bot f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
John Molakvoæ (skjnldsv) b188b2d133
Rebase settings build
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:22:48 +02:00
John Molakvoæ (skjnldsv) 6d5cb3503f
revert unwanted changes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:22:07 +02:00
John Molakvoæ (skjnldsv) e01f004a13
Fixed tests and improved app-navigation-caption
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:21:54 +02:00
John Molakvoæ (skjnldsv) 938553ab07
IE11 css vars compatibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:21:54 +02:00
John Molakvoæ (skjnldsv) 1dc76f2f6b
More vars fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:20:51 +02:00
Nextcloud bot cad8824a8e
[tx-robot] updated from transifex 2018-06-20 00:12:26 +00:00
John Molakvoæ (skjnldsv) 259f70d640
Apps search
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:55:44 +02:00
John Molakvoæ (skjnldsv) 0281e9dafc
Fit user search to new standard
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:54:00 +02:00
John Molakvoæ (skjnldsv) 2f38f2b707
Add user search support
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:53:20 +02:00
John Molakvoæ 7fdba6f607
Merge pull request #9919 from nextcloud/immutable-groups
Don't pretend we can add/remove users to/from groups when we can't
2018-06-19 23:52:04 +02:00
John Molakvoæ (skjnldsv) a53dbb8c0b
New user support, provisionning api and design fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:20:33 +02:00
Roeland Jago Douma 3cbe40ffac
If cronErros is empty json_decode will return NULL
Fixes #9867

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-19 16:26:06 +02:00
Robin Appelman 8a1cbbd90e
Don't pretend we can add/remove users to/from groups when we can't
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-19 16:23:02 +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
Jaczel 7672716ccf Fixed English grammatical error on Settings page. 2018-06-19 20:30:49 +10: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
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
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
Nextcloud bot c8e61cc252
[tx-robot] updated from transifex 2018-06-18 00:12:35 +00:00
Nextcloud bot 5e5671983c
[tx-robot] updated from transifex 2018-06-17 00:12:48 +00:00
Nextcloud bot db9ad32d75
[tx-robot] updated from transifex 2018-06-16 00:13:15 +00:00