Skip to content

[stable14] Add new group entry on users list + fixes #11575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Oct 3, 2018
Merged

[stable14] Add new group entry on users list + fixes #11575

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f8a34f
Add new group entry on users list + fixes
skjnldsv Sep 12, 2018
0c4e270
Fixed js error
skjnldsv Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add new group entry on users list + fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Oct 3, 2018
commit 1f8a34f4385124d03b47f404f3bcf0ac1b522dc1
15 changes: 0 additions & 15 deletions settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,21 +1377,6 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {

/* USERS LIST -------------------------------------------------------------- */
#body-settings {
#app-navigation {
/* Hack to override the javascript orderBy */
#usergrouplist > li {
order: 4;
&#everyone {
order:1;
}
&#admin {
order:2;
}
&#disabled {
order:3;
}
}
}
$grid-row-height: 46px;
#app-content.user-list-grid {
display: grid;
Expand Down
107 changes: 96 additions & 11 deletions settings/js/settings-vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/settings-vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

101 changes: 74 additions & 27 deletions settings/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions settings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "settings",
"description": "Nextcloud settings",
"version": "1.2.2",
"version": "1.2.3",
"author": "John Molakvoæ (skjnldsv) <[email protected]>",
"license": "AGPL3",
"private": true,
Expand All @@ -13,12 +13,13 @@
"dependencies": {
"@babel/polyfill": "^7.0.0",
"axios": "^0.18.0",
"nextcloud-vue": "^0.1.5",
"v-tooltip": "^2.0.0-rc.33",
"vue": "^2.5.17",
"vue-click-outside": "^1.0.7",
"vue-infinite-loading": "^2.3.3",
"vue-localstorage": "^0.6.2",
"vue-multiselect": "^2.1.0",
"vue-multiselect": "^2.1.2",
"vue-router": "^3.0.1",
"vuex": "^3.0.1",
"vuex-router-sync": "^5.0.0"
Expand Down
Loading