Skip to content
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

Share course with specific users #2204

Merged
merged 34 commits into from
Feb 26, 2019
Merged

Share course with specific users #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cd1ac09
Add front-end
taylortom Sep 17, 2018
a058fad
Fix helper
taylortom Sep 17, 2018
0554a22
Refactor middleware
taylortom Sep 17, 2018
c50e0fa
Update role permissions
taylortom Sep 18, 2018
4f94533
Refactor API endpoints to work with new sharing
taylortom Sep 18, 2018
92bce35
Remove sharedProjectView
taylortom Sep 18, 2018
4bcd32b
Remove model attribute
taylortom Sep 18, 2018
4d49532
Filter out me
taylortom Sep 18, 2018
e62406e
Fix query
taylortom Sep 24, 2018
8b9360a
Update lang strings
taylortom Sep 24, 2018
c53a3ae
Add population to user route
taylortom Sep 24, 2018
2811e62
Refactor route to allow querying
taylortom Sep 24, 2018
7032d8b
Fix function
taylortom Sep 24, 2018
457b84f
Add creator to projectView
taylortom Sep 24, 2018
fedccf3
Refactor permissions
taylortom Sep 24, 2018
c5eaf9a
Remove comment
taylortom Sep 24, 2018
e5a6b55
Update title text
taylortom Nov 1, 2018
d93666e
Update selectize
taylortom Nov 1, 2018
c25966e
Add common selectize less
taylortom Nov 1, 2018
89c5cab
Update input
taylortom Nov 1, 2018
3d22155
Add error message
taylortom Nov 1, 2018
d0f9016
Merge branch 'develop' into feature/sharing
taylortom Jan 28, 2019
0292151
Move item rendering into hbs
taylortom Feb 12, 2019
368067f
Refactor to return early
taylortom Feb 12, 2019
33a41e1
Merge branch 'release/0.7.0' into feature/sharing
taylortom Feb 12, 2019
cc85190
Merge branch 'release/0.7.0' into feature/sharing
taylortom Feb 20, 2019
aaef746
Reapply changes lost in merge
taylortom Feb 20, 2019
4dc17f2
Make selectize styling consistent
taylortom Feb 20, 2019
7eee01e
Remove helper
taylortom Feb 22, 2019
7c960dd
Refactor to fix permissions issue
taylortom Feb 22, 2019
95230e0
Add defensive programming for courses without a creator
taylortom Feb 25, 2019
8d62a16
Fix permissions check
taylortom Feb 25, 2019
63434b4
Merge branch 'release/0.7.0' into feature/sharing
taylortom Feb 25, 2019
c5e9efa
Alter shared courses query
taylortom Feb 26, 2019
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
129 changes: 104 additions & 25 deletions frontend/src/libraries/selectize/css/selectize.less
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.css (v0.12.4)
* selectize.default.css (v0.12.6) - Default Theme
* Copyright (c) 2013–2015 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand All @@ -13,14 +13,13 @@
*
* @author Brian Reavis <[email protected]>
*/

.selectize-control.plugin-drag_drop.multi > .selectize-input > div.ui-sortable-placeholder {
visibility: visible !important;
background: #f2f2f2 !important;
background: rgba(0, 0, 0, 0.06) !important;
border: 0 none !important;
-webkit-box-shadow: inset 0 0 12px 4px #ffffff;
box-shadow: inset 0 0 12px 4px #ffffff;
-webkit-box-shadow: inset 0 0 12px 4px #fff;
box-shadow: inset 0 0 12px 4px #fff;
}
.selectize-control.plugin-drag_drop .ui-sortable-placeholder::after {
content: '!';
Expand Down Expand Up @@ -89,7 +88,7 @@
vertical-align: middle;
display: inline-block;
padding: 2px 0 0 0;
border-left: 1px solid #d0d0d0;
border-left: 1px solid #0073bb;
-webkit-border-radius: 0 2px 2px 0;
-moz-border-radius: 0 2px 2px 0;
border-radius: 0 2px 2px 0;
Expand All @@ -101,18 +100,18 @@
background: rgba(0, 0, 0, 0.05);
}
.selectize-control.plugin-remove_button [data-value].active .remove {
border-left-color: #cacaca;
border-left-color: #00578d;
}
.selectize-control.plugin-remove_button .disabled [data-value] .remove:hover {
background: none;
}
.selectize-control.plugin-remove_button .disabled [data-value] .remove {
border-left-color: #ffffff;
border-left-color: #aaaaaa;
}
.selectize-control.plugin-remove_button .remove-single {
position: absolute;
right: 28px;
top: 6px;
right: 0;
top: 0;
font-size: 23px;
}
.selectize-control {
Expand All @@ -129,7 +128,7 @@
}
.selectize-input,
.selectize-control.single .selectize-input.input-active {
background: #ffffff;
background: #fff;
cursor: text;
display: inline-block;
}
Expand All @@ -151,10 +150,10 @@
border-radius: 3px;
}
.selectize-control.multi .selectize-input.has-items {
padding: 6px 8px 3px;
padding: 5px 8px 2px;
}
.selectize-input.full {
background-color: #ffffff;
background-color: #fff;
}
.selectize-input.disabled,
.selectize-input.disabled * {
Expand All @@ -180,28 +179,28 @@
cursor: pointer;
margin: 0 3px 3px 0;
padding: 2px 6px;
background: #f2f2f2;
color: #303030;
border: 0 solid #d0d0d0;
background: #1da7ee;
color: #fff;
border: 1px solid #0073bb;
}
.selectize-control.multi .selectize-input > div.active {
background: #e8e8e8;
color: #303030;
border: 0 solid #cacaca;
background: #92c836;
color: #fff;
border: 1px solid #00578d;
}
.selectize-control.multi .selectize-input.disabled > div,
.selectize-control.multi .selectize-input.disabled > div.active {
color: #7d7d7d;
background: #ffffff;
border: 0 solid #ffffff;
color: #ffffff;
background: #d2d2d2;
border: 1px solid #aaaaaa;
}
.selectize-input > input {
display: inline-block !important;
padding: 0 !important;
min-height: 0 !important;
max-height: none !important;
max-width: 100% !important;
margin: 0 2px 0 0 !important;
margin: 0 1px !important;
text-indent: 0 !important;
border: 0 none !important;
background: none !important;
Expand Down Expand Up @@ -235,7 +234,7 @@
position: absolute;
z-index: 10;
border: 1px solid #d0d0d0;
background: #ffffff;
background: #fff;
margin: -1px 0 0 0;
border-top: 0 none;
-webkit-box-sizing: border-box;
Expand All @@ -257,16 +256,25 @@
-moz-border-radius: 1px;
border-radius: 1px;
}
.selectize-dropdown [data-selectable],
.selectize-dropdown .option,
.selectize-dropdown .optgroup-header {
padding: 5px 8px;
}
.selectize-dropdown .option,
.selectize-dropdown [data-disabled],
.selectize-dropdown [data-disabled] [data-selectable].option {
cursor: inherit;
opacity: 0.5;
}
.selectize-dropdown [data-selectable].option {
opacity: 1;
}
.selectize-dropdown .optgroup:first-child .optgroup-header {
border-top: 0 none;
}
.selectize-dropdown .optgroup-header {
color: #303030;
background: #ffffff;
background: #fff;
cursor: default;
}
.selectize-dropdown .active {
Expand Down Expand Up @@ -322,3 +330,74 @@
opacity: 0.5;
background-color: #fafafa;
}
.selectize-control.multi .selectize-input.has-items {
padding-left: 5px;
padding-right: 5px;
}
.selectize-control.multi .selectize-input.disabled [data-value] {
color: #999;
text-shadow: none;
background: none;
-webkit-box-shadow: none;
box-shadow: none;
}
.selectize-control.multi .selectize-input.disabled [data-value],
.selectize-control.multi .selectize-input.disabled [data-value] .remove {
border-color: #e6e6e6;
}
.selectize-control.multi .selectize-input.disabled [data-value] .remove {
background: none;
}
.selectize-control.multi .selectize-input [data-value] {
text-shadow: 0 1px 0 rgba(0, 51, 83, 0.3);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
background-color: #1b9dec;
background-image: -moz-linear-gradient(top, #1da7ee, #178ee9);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1da7ee), to(#178ee9));
background-image: -webkit-linear-gradient(top, #1da7ee, #178ee9);
background-image: -o-linear-gradient(top, #1da7ee, #178ee9);
background-image: linear-gradient(to bottom, #1da7ee, #178ee9);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff1da7ee', endColorstr='#ff178ee9', GradientType=0);
-webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03);
box-shadow: 0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03);
}
.selectize-control.multi .selectize-input [data-value].active {
background-color: #0085d4;
background-image: -moz-linear-gradient(top, #008fd8, #0075cf);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#008fd8), to(#0075cf));
background-image: -webkit-linear-gradient(top, #008fd8, #0075cf);
background-image: -o-linear-gradient(top, #008fd8, #0075cf);
background-image: linear-gradient(to bottom, #008fd8, #0075cf);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff008fd8', endColorstr='#ff0075cf', GradientType=0);
}
.selectize-control.single .selectize-input {
-webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8);
box-shadow: 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8);
background-color: #f9f9f9;
background-image: -moz-linear-gradient(top, #fefefe, #f2f2f2);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fefefe), to(#f2f2f2));
background-image: -webkit-linear-gradient(top, #fefefe, #f2f2f2);
background-image: -o-linear-gradient(top, #fefefe, #f2f2f2);
background-image: linear-gradient(to bottom, #fefefe, #f2f2f2);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffefefe', endColorstr='#fff2f2f2', GradientType=0);
}
.selectize-control.single .selectize-input,
.selectize-dropdown.single {
border-color: #b8b8b8;
}
.selectize-dropdown .optgroup-header {
padding-top: 7px;
font-weight: bold;
font-size: 0.85em;
}
.selectize-dropdown .optgroup {
border-top: 1px solid #f0f0f0;
}
.selectize-dropdown .optgroup:first-child {
border-top: 0 none;
}
Loading