Commit graph

44155 commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv)
c367cb20fa
Jquery ocdialog scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:06 +02:00
John Molakvoæ (skjnldsv)
1977d846b7
Jquery ui fixes scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:06 +02:00
John Molakvoæ (skjnldsv)
4ac9d1d87f
Styles scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:06 +02:00
John Molakvoæ (skjnldsv)
eb257b8dd3
Share scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:06 +02:00
John Molakvoæ (skjnldsv)
1d95e6532f
Public scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:06 +02:00
John Molakvoæ (skjnldsv)
08f1edd119
Tooltip scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
7a4cee5070
Multiselect scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
f2de6568a3
Mobile scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
e8ccdb8644
Inputs scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
d44e6b7266
Icons scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
5e4e5531cf
Fixes scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
e8f13c3026
Header scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
734e26850b
Apps scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
John Molakvoæ (skjnldsv)
49dc8c5397
Css4 vars root init
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:05 +02:00
Roeland Jago Douma
9d37c191a3
Merge pull request #9927 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.12.0
Bump webpack from 4.11.1 to 4.12.0 in /apps/oauth2
2018-06-20 14:30:36 +02:00
Morris Jobke
50df29ded0
Merge pull request #9900 from nextcloud/feature/noid/wait-for-cron-to-finish
Wait for cron to finish before running upgrade command
2018-06-20 14:14:07 +02:00
dependabot[bot]
ff476c8b55
Bump webpack from 4.11.1 to 4.12.0 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.11.1...v4.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-20 10:10:45 +00:00
John Molakvoæ
f9b24cbb23
Merge pull request #9929 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-cli-3.0.8
Bump webpack-cli from 3.0.3 to 3.0.8 in /apps/oauth2
2018-06-20 12:07:56 +02:00
dependabot[bot]
410a546c8b
Bump webpack-cli from 3.0.3 to 3.0.8 in /apps/oauth2
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-20 09:23:39 +00:00
John Molakvoæ
8142ee548c
Merge pull request #9928 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-merge-4.1.3
Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/oauth2
2018-06-20 11:21:11 +02:00
dependabot[bot]
f0316c8b61
Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/oauth2
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-20 08:40:45 +00:00
John Molakvoæ
1a1c0e7ac0
Merge pull request #9930 from nextcloud/tests/noid/add-oauth2-build
Add vue build for oauth2 app to drone
2018-06-20 10:35:33 +02:00
John Molakvoæ (skjnldsv)
48016f00a4
Bump build and config
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 10:12:21 +02:00
Julius Härtl
2791bedfa9
Add vue build for oauth2 app to drone
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-20 09:32:23 +02:00
Nextcloud bot
cad8824a8e
[tx-robot] updated from transifex 2018-06-20 00:12:26 +00:00
John Molakvoæ
625bdf0e6c
Merge pull request #9912 from nextcloud/search-standard
New search standard and user search
2018-06-20 00:45:02 +02: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)
8f88c5acdd
Debounce search and reset
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:54:00 +02:00
Morris Jobke
4fc9bdea4e
Run vue builds in parallel
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-19 23:54:00 +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)
21441fad9b
Added new search standard
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:53:20 +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æ (skjnldsv)
e5f08620d4
Better design for core search, fixes and style to scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:53:19 +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
Morris Jobke
0cf0ef024f
Merge pull request #9920 from nextcloud/fix/9867/fix_setup_check
If cronErros is empty json_decode will return NULL
2018-06-19 18:15:57 +02:00
Morris Jobke
def12a9be9
Fix tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-19 17:17:34 +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
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
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