Ramon Wenger
|
95545904a6
|
Merge branch 'feature/remove-school'
|
2018-10-15 15:03:54 +02:00 |
|
Ramon Wenger
|
0f5d9f80af
|
Remove school model, refactor code
|
2018-10-15 15:03:25 +02:00 |
Christian Cueni
|
78f142e2da
|
fix missing objectives
|
2018-10-15 14:09:56 +02:00 |
|
Ramon Wenger
|
72cab13b36
|
Add default users
|
2018-10-15 13:54:34 +02:00 |
|
Ramon Wenger
|
74f25850f1
|
Remove debug information
|
2018-10-11 16:14:48 +02:00 |
|
Ramon Wenger
|
6772aba1c9
|
Make image blocks work
|
2018-10-11 16:07:02 +02:00 |
|
Ramon Wenger
|
e1deb19ca8
|
Re-do all migrations
|
2018-10-11 15:47:12 +02:00 |
|
Ramon Wenger
|
9e1c0cd39b
|
Merge remote-tracking branch 'origin/feature/objective-control'
|
2018-10-11 15:44:27 +02:00 |
|
Christian Cueni
|
cf01aa2bf9
|
add missing variables to update, remove confusing class name 🤯
|
2018-10-11 15:08:35 +02:00 |
|
Ramon Wenger
|
55683da3ed
|
Fix Unit Tests
|
2018-10-11 14:56:11 +02:00 |
|
Christian Cueni
|
5dd77eab5d
|
use cache for update, incorperate feedback
|
2018-10-11 14:12:47 +02:00 |
|
Ramon Wenger
|
92a6997ba5
|
Merge branch 'feature/article-from-room-entry'
|
2018-10-11 14:09:27 +02:00 |
|
Ramon Wenger
|
3d0c9e4b93
|
Render room entry dynamically on article view
|
2018-10-11 14:09:09 +02:00 |
|
Ramon Wenger
|
a4954b4e82
|
Remove sandbox folder
|
2018-10-11 13:46:12 +02:00 |
|
Ramon Wenger
|
ce86e45743
|
Add content block deletion mutation
|
2018-10-11 11:39:50 +02:00 |
|
Ramon Wenger
|
4d1e156f9f
|
Merge branch 'feature/user-created-content-blocks'
|
2018-10-10 15:48:08 +02:00 |
|
Ramon Wenger
|
eafff751f8
|
Filter content blocks by permission and ownership
|
2018-10-10 14:18:15 +02:00 |
|
Christian Cueni
|
5970ac3427
|
update objective progress items
|
2018-10-10 10:45:56 +02:00 |
|
Ramon Wenger
|
645c998d5c
|
Add 'user created' property on user created content blocks
|
2018-10-10 10:34:30 +02:00 |
|
Ramon Wenger
|
9fed2b8422
|
Rename folder user to users
|
2018-10-10 09:40:24 +02:00 |
|
Ramon Wenger
|
8110ee359f
|
Distinguish between default and user created content blocks in cms admin
|
2018-10-09 17:42:19 +02:00 |
|
Christian Cueni
|
3369d0fbb7
|
add blank layout
|
2018-10-09 10:22:54 +02:00 |
|
Christian Cueni
|
6d988d3a5c
|
Merge branch 'master' of bitbucket.org:iterativ/skillbox
|
2018-10-09 09:57:35 +02:00 |
|
Christian Cueni
|
e602cd8a8d
|
add start page
|
2018-10-09 09:57:10 +02:00 |
|
Ramon Wenger
|
c56cfb8c19
|
Add user icon to user widget
|
2018-10-08 17:42:52 +02:00 |
|
Ramon Wenger
|
9fad28f97c
|
Merge branch 'feature/student-submissions'
|
2018-10-08 16:57:06 +02:00 |
|
Ramon Wenger
|
ace485bca2
|
Move assignment with submissions to own component
|
2018-10-08 16:56:25 +02:00 |
|
Ramon Wenger
|
f75b04b82f
|
Add active state on submissions link
|
2018-10-08 16:55:39 +02:00 |
|
Ramon Wenger
|
26d3479871
|
Add title to assignment view
Also, make route changes work smoothly
|
2018-10-08 16:00:32 +02:00 |
|
Ramon Wenger
|
6e75b55475
|
Improve navigation styling
|
2018-10-08 15:32:25 +02:00 |
|
Ramon Wenger
|
3be07c471c
|
Add submissions query to submissions page
|
2018-10-08 15:05:59 +02:00 |
|
Ramon Wenger
|
6f15ac4173
|
Fix bug in role retrieval
|
2018-10-08 14:35:57 +02:00 |
|
Ramon Wenger
|
b1e44ef263
|
Rename rooms query
|
2018-10-08 14:34:56 +02:00 |
|
Ramon Wenger
|
2adfffd441
|
Add role to user query
|
2018-10-08 11:34:04 +02:00 |
|
Ramon Wenger
|
d970f75fa4
|
Refactor school class naming
|
2018-10-08 10:52:55 +02:00 |
Daniel Egger
|
85cc99470e
|
Fixed case problem in filename for gql imports
|
2018-10-06 23:23:00 +02:00 |
|
Daniel Egger
|
a305d35f5f
|
Merge branch 'feature/filter-content-per-user'
|
2018-10-06 16:52:02 +02:00 |
|
Daniel Egger
|
9efd000aa1
|
Refactored from method to computed
|
2018-10-06 16:26:38 +02:00 |
|
Daniel Egger
|
1d29cc51ec
|
Fixed rooms for new SchoolClass model
|
2018-10-05 14:38:51 +02:00 |
|
Daniel Egger
|
67f303f46f
|
Hide "Alles"-RadioButton when user is student
|
2018-10-05 14:23:53 +02:00 |
|
Daniel Egger
|
bd4a9fded3
|
Show ContentBlock actions only with the right permission
|
2018-10-05 14:11:00 +02:00 |
|
Daniel Egger
|
f3bcea7528
|
Refactored VisibilityPopover for new SchoolClass
|
2018-10-05 11:51:41 +02:00 |
|
Daniel Egger
|
41d6e87f81
|
Refactored FilterBar to only show school-classes of logged in user
|
2018-10-05 11:40:24 +02:00 |
|
Daniel Egger
|
d273d711c1
|
Renamed UserGroup to SchoolClass step 2
|
2018-10-05 11:25:05 +02:00 |
|
Daniel Egger
|
b2cac389cf
|
Renamed UserGroup to SchoolClass and reset migrations
|
2018-10-05 10:59:57 +02:00 |
|
Daniel Egger
|
21c85941be
|
Show the name of the logged in user in DefaultLayout
|
2018-10-05 10:49:12 +02:00 |
|
Daniel Egger
|
ae7fc596b9
|
Make push to master deploy on myskillbox.ch
|
2018-10-04 22:26:05 +02:00 |
|
Daniel Egger
|
31c22846f6
|
Added DEFAULT_SCHOOL_ID
The DEFAULT_SCHOOL_ID is used as long as we have only one school.
That simplifies some code for now.
|
2018-10-04 22:15:36 +02:00 |
|
Daniel Egger
|
1574b8fbcc
|
Added GraphQL "me" query to get user permissions
|
2018-10-04 22:10:31 +02:00 |
|
Ramon Wenger
|
a204de4098
|
Improve dynamic module navigation, add anchors
|
2018-10-04 20:06:22 +02:00 |