 Ramon Wenger
|
9d45d5d360
|
Close sidebar when clicking on class list link
|
2020-02-27 14:24:28 +01:00 |
|
Ramon Wenger
|
fffbc47fde
|
Change profile layout
|
2020-02-27 14:21:56 +01:00 |
|
Ramon Wenger
|
c8449e7fe9
|
Fix some IE 10 issues
|
2020-02-27 14:01:13 +01:00 |
Christian Cueni
|
f08c6bf807
|
Remove change password spec
|
2020-02-27 14:00:57 +01:00 |
|
Christian Cueni
|
ca90f32e03
|
Fix cypress tests
|
2020-02-27 13:37:32 +01:00 |
|
Christian Cueni
|
59f650891c
|
Remove change password test
|
2020-02-27 11:37:24 +01:00 |
|
Christian Cueni
|
d95e8ca492
|
Merge branch 'develop' into feature/licensing
# Conflicts:
# Pipfile.lock
# client/cypress/fixtures/schema.json
# client/src/graphql/client.js
# client/src/graphql/resolvers.js
# client/src/graphql/typedefs.js
# client/src/main.js
# client/src/router/index.js
# server/users/models.py
|
2020-02-27 10:29:24 +01:00 |
|
Christian Cueni
|
8f9750ebe8
|
Style beta login pages
|
2020-02-27 09:10:25 +01:00 |
|
Ramon Wenger
|
162615ce5c
|
Remove password change form
|
2020-02-26 18:36:31 +01:00 |
|
Ramon Wenger
|
5054f21bc9
|
Update wording
|
2020-02-26 16:01:26 +01:00 |
|
Ramon Wenger
|
1c71c24ea0
|
Change redirect for new student, also add new test
|
2020-02-26 12:48:30 +01:00 |
|
Ramon Wenger
|
e869cc8829
|
Add mixin for `me` query
|
2020-02-26 12:48:07 +01:00 |
|
Ramon Wenger
|
dccbf2ae1a
|
Fix cypress test
|
2020-02-26 12:47:33 +01:00 |
|
Ramon Wenger
|
0ffe77b745
|
Add more data properties
|
2020-02-26 12:47:20 +01:00 |
|
Christian Cueni
|
5e77ee0cee
|
Fix helloEmail, make linter happy
|
2020-02-26 12:44:41 +01:00 |
|
Christian Cueni
|
3d63a7933d
|
Rename local login url
|
2020-02-25 16:22:27 +01:00 |
|
Ramon Wenger
|
ee78a3229f
|
Refactor mixins
|
2020-02-25 15:46:11 +01:00 |
|
Ramon Wenger
|
4f7a2cdc2f
|
Move class selection to sidebar, refactor it in the process
|
2020-02-25 15:46:11 +01:00 |
|
Christian Cueni
|
b572523a33
|
Add proxy for registration call
|
2020-02-25 14:42:42 +01:00 |
|
Ramon Wenger
|
a7413c6ce0
|
Merged in feature/multiple-classes-for-everyone (pull request #46)
Feature/multiple classes for everyone
Approved-by: Christian Cueni
|
2020-02-25 08:42:21 +00:00 |
|
Ramon Wenger
|
2e1d7b46bc
|
Add error message and add styling
|
2020-02-24 18:32:55 +01:00 |
|
Ramon Wenger
|
a59733b2f1
|
Add redirect after joining class
|
2020-02-24 16:23:55 +01:00 |
|
Ramon Wenger
|
ca97a15398
|
Merge branch 'hotfix/postgres-pipelines' into feature/multiple-classes-for-everyone
|
2020-02-24 16:11:25 +01:00 |
|
Christian Cueni
|
a481989348
|
Add footer
|
2020-02-24 15:17:11 +01:00 |
|
Christian Cueni
|
a28c462a1e
|
Merge branch 'hotfix/postgres-pipelines' into feature/licensing
|
2020-02-24 11:32:18 +01:00 |
|
Christian Cueni
|
f8fab82851
|
Finish coupon flow
|
2020-02-24 11:30:37 +01:00 |
|
Christian Cueni
|
1152f1fd95
|
Add forgot password page, add cancel button to login
|
2020-02-20 11:24:10 +01:00 |
|
Christian Cueni
|
c93d2f6843
|
Remove hep id as default
|
2020-02-18 16:57:36 +01:00 |
|
Christian Cueni
|
e9713c736b
|
Redirect to hello, add redirect query param
|
2020-02-18 16:32:12 +01:00 |
|
Christian Cueni
|
e067717d50
|
Fix local login
|
2020-02-18 16:01:20 +01:00 |
|
Christian Cueni
|
3c72c9559e
|
Split token and local login
|
2020-02-18 14:36:49 +01:00 |
|
Christian Cueni
|
42d16caafc
|
Allow coupon calls
|
2020-02-18 14:10:04 +01:00 |
|
Christian Cueni
|
f3bd38e819
|
Redirect users without license to coupon page
|
2020-02-18 13:48:45 +01:00 |
|
Christian Cueni
|
26a342c5a5
|
Fix license verification flow
|
2020-02-18 13:32:17 +01:00 |
|
Ramon Wenger
|
fb65e23f3d
|
Update news links on start page
|
2020-02-18 10:24:17 +01:00 |
|
Ramon Wenger
|
878937257e
|
Rename top navigation to content navigation
|
2020-02-18 10:22:56 +01:00 |
|
Christian Cueni
|
677d8dbf44
|
Fix login & tests
|
2020-02-18 10:05:07 +01:00 |
|
Ramon Wenger
|
c0cbffecbc
|
Add sidebar to the blank layout
|
2020-02-18 09:21:32 +01:00 |
|
Ramon Wenger
|
99ef303c4d
|
Move logout link to sidebar
|
2020-02-18 09:21:15 +01:00 |
|
Ramon Wenger
|
e96211803b
|
Clean up code
|
2020-02-18 09:20:47 +01:00 |
|
Ramon Wenger
|
ef4f8aefd3
|
Add user data to profile widget
|
2020-02-17 16:50:07 +01:00 |
|
Ramon Wenger
|
5b67ecfb8c
|
Add profile edit link to sidebar
|
2020-02-17 16:20:53 +01:00 |
|
Ramon Wenger
|
2f00a98838
|
Add new default user avatar
|
2020-02-17 16:16:33 +01:00 |
|
Ramon Wenger
|
bdd3705bff
|
Update styling, clean up code
|
2020-02-17 16:16:13 +01:00 |
|
Ramon Wenger
|
879db2000b
|
Toggle the new sidebar
|
2020-02-17 16:14:48 +01:00 |
|
Ramon Wenger
|
08b816f3fd
|
Add sidebar
|
2020-02-17 16:13:48 +01:00 |
|
Christian Cueni
|
36c43bf4e1
|
Detect 402 in frontend, allow me query
|
2020-02-17 16:08:47 +01:00 |
|
Christian Cueni
|
c9c42e2296
|
Check user license in Api, save
|
2020-02-17 15:08:06 +01:00 |
|
Ramon Wenger
|
d22a77e513
|
Update styling on join class page
|
2020-02-13 15:51:50 +01:00 |
|
Christian Cueni
|
d5276d5adc
|
Update and test front end email verification
|
2020-02-13 12:42:17 +01:00 |
|
Christian Cueni
|
909f7337ac
|
Fix email verification for stage
|
2020-02-13 11:28:23 +01:00 |
|
Christian Cueni
|
82c1135f0e
|
Add coupon call in frontend, add tests, fix api
|
2020-02-13 10:03:00 +01:00 |
|
Ramon Wenger
|
97469ce419
|
Mock the backend for the cypress test
|
2020-02-12 21:01:26 +01:00 |
|
Ramon Wenger
|
76fa510053
|
Update local school class cache after joining a class
|
2020-02-12 20:28:46 +01:00 |
|
Christian Cueni
|
f5ddff12e3
|
Add email verification tests
|
2020-02-12 15:49:56 +01:00 |
|
Christian Cueni
|
6509b31ab5
|
Add registration tests
|
2020-02-12 13:37:36 +01:00 |
|
Ramon Wenger
|
919c0aec18
|
Add loading message for spellcheck
|
2020-02-12 10:37:34 +01:00 |
|
Ramon Wenger
|
a4a5e37268
|
Add code to school class, add form and mutation to join class
|
2020-02-12 10:17:31 +01:00 |
|
Christian Cueni
|
dd272757bf
|
Add login tests
|
2020-02-11 16:47:21 +01:00 |
|
Christian Cueni
|
0922c5d198
|
Fix local signup, style header
|
2020-02-11 14:44:57 +01:00 |
|
Christian Cueni
|
b36ba5f9a1
|
Add email verifcation page
|
2020-02-11 14:44:14 +01:00 |
|
Christian Cueni
|
a0eeec4e18
|
Add extra fields to registration, remove unused fields
|
2020-02-11 14:44:14 +01:00 |
|
Christian Cueni
|
587d661ca8
|
Add hello page, add local mutation
|
2020-02-11 14:42:58 +01:00 |
|
Christian Cueni
|
1d50287dbf
|
Add basic registration flow
|
2020-02-11 14:41:55 +01:00 |
|
Ramon Wenger
|
6688cedd7c
|
Add initial cypress test for students to join classes
|
2020-02-10 15:42:22 +01:00 |
|
Ramon Wenger
|
12f3b2d9a7
|
Simplify the logic of visible content blocks for students
|
2020-02-10 09:27:43 +01:00 |
|
Ramon Wenger
|
542c7c6d84
|
Merged in feature/taskbase-spellcheck (pull request #45)
Feature/taskbase spellcheck
Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
|
2020-02-06 14:16:40 +00:00 |
|
Ramon Wenger
|
d11d494fae
|
Clean up code
|
2020-02-06 15:06:50 +01:00 |
|
Ramon Wenger
|
2e4ac4d265
|
Add empty property to instrument activity
|
2020-02-05 14:00:25 +01:00 |
|
Ramon Wenger
|
66842ac1d8
|
Add instruments to the my activity page
|
2020-02-05 11:35:04 +01:00 |
|
Ramon Wenger
|
c4cacac1c7
|
Update schema, fix cypress test
|
2020-02-04 22:05:12 +01:00 |
|
Ramon Wenger
|
e8ada8f372
|
Add styling for spell check and teacher feedback
|
2020-02-03 15:11:01 +01:00 |
|
Ramon Wenger
|
6948c6724f
|
Reset corrections on input and on turn in
|
2020-02-03 15:06:43 +01:00 |
|
Ramon Wenger
|
ec1d68dd51
|
Add sentence offset to spell check results
Without that property, the offset always just starts at the current
sentence, not the whole user input
|
2020-02-03 15:04:52 +01:00 |
|
Christian Cueni
|
113b1d8d9a
|
Reset cache on logout, refactor logout
|
2020-01-22 08:43:01 +01:00 |
|
Ramon Wenger
|
c9222adf60
|
Update cypress tests to mock the server
|
2020-01-20 17:14:20 +01:00 |
Ramon Wenger
|
2b9d14222d
|
Fix order of corrections
|
2020-01-20 13:03:01 +01:00 |
|
Ramon Wenger
|
bc9bf8cdec
|
Remove modules from manual cache definition
|
2020-01-20 13:03:01 +01:00 |
|
Ramon Wenger
|
374186ed27
|
Re-add styling for highlights
|
2020-01-20 13:02:27 +01:00 |
|
Ramon Wenger
|
cdb2570203
|
Add schema file, also add instructions to readme
|
2020-01-20 13:02:27 +01:00 |
|
Ramon Wenger
|
cfde20c67c
|
Add spell check component
|
2020-01-20 13:01:47 +01:00 |
|
Ramon Wenger
|
ff7a6b93b3
|
Add first implementation of a test with mocked GraphQL calls
|
2020-01-20 13:01:47 +01:00 |
|
Ramon Wenger
|
9ee3dc48b5
|
Add login via GraphQL to cypress commands
|
2020-01-20 13:01:00 +01:00 |
|
Ramon Wenger
|
7f71977523
|
Add initial frontend implementation for spell checks
|
2020-01-20 13:01:00 +01:00 |
|
Ramon Wenger
|
a195492ece
|
Temporarily disable problematic test
|
2020-01-20 11:06:51 +01:00 |
|
Ramon Wenger
|
6c8628f56f
|
Prevent apollo client from throwing errors on 302 response
|
2020-01-20 10:38:29 +01:00 |
|
Ramon Wenger
|
013b020f68
|
Upgrade cypress version
|
2020-01-16 17:48:25 +01:00 |
|
Ramon Wenger
|
68c5375bab
|
Add test to check solution display in surveys
|
2020-01-16 16:36:27 +01:00 |
|
Ramon Wenger
|
6b8b520bc5
|
Add test to check solution display in surveys
|
2020-01-16 16:07:00 +01:00 |
|
Ramon Wenger
|
00b2b02113
|
Use slug to identify module when toggling solutions
|
2020-01-16 15:49:50 +01:00 |
|
Ramon Wenger
|
ea95efc23f
|
Make test fail when it should fail
|
2020-01-16 15:49:14 +01:00 |
|
Ramon Wenger
|
8c908fddd2
|
Use slug to identify modules for the bookmark mutation
|
2020-01-16 15:03:50 +01:00 |
|
Ramon Wenger
|
e92412cf21
|
Clean up code
|
2020-01-16 14:10:16 +01:00 |
|
Ramon Wenger
|
d4d2e9934e
|
Add note to instruments
|
2020-01-16 10:45:36 +01:00 |
|
Ramon Wenger
|
5200d2165d
|
Use slug to identify instruments on client
|
2020-01-16 10:44:37 +01:00 |
|
Ramon Wenger
|
35cdd5ff5f
|
Remove superfluous query file
|
2020-01-13 19:48:46 +01:00 |
|
Ramon Wenger
|
2b40f81764
|
Add bookmark actions to instrument, implement instrument bookmark
|
2020-01-08 15:00:40 +01:00 |
|
Ramon Wenger
|
8765de9603
|
Add instrument query by id
|
2020-01-08 14:58:07 +01:00 |
|
Ramon Wenger
|
01ab01a9e9
|
Add instruments to local cache
|
2020-01-08 14:56:07 +01:00 |
|
Ramon Wenger
|
27b068e9ef
|
Add news item
|
2019-12-24 22:23:58 +01:00 |
|
Ramon Wenger
|
a75ae4f3fc
|
Add top border to my activities
|
2019-12-19 14:19:42 +01:00 |
|
Ramon Wenger
|
32ae0b0641
|
Add filter for my activity
|
2019-12-19 14:19:20 +01:00 |
|
Ramon Wenger
|
74c74c1eca
|
Add missing block type in my activities
|
2019-12-19 11:38:15 +01:00 |
|
Ramon Wenger
|
7237b86ac0
|
Refactor code
|
2019-12-19 11:38:07 +01:00 |
|
Ramon Wenger
|
a76b27bf0b
|
Fix margin on link block in my activities
|
2019-12-19 11:37:31 +01:00 |
|
Ramon Wenger
|
de5882f644
|
Add anchor for notes
|
2019-12-19 11:36:29 +01:00 |
|
Ramon Wenger
|
64db0487ca
|
Refresh my activities periodically
|
2019-12-19 11:35:47 +01:00 |
|
Ramon Wenger
|
ddf3bde076
|
Add clickable link to my activities
|
2019-12-19 11:34:20 +01:00 |
|
Ramon Wenger
|
9fb8e13c1c
|
Enable scrolling to the content blocks in a module
|
2019-12-18 16:28:24 +01:00 |
|
Ramon Wenger
|
65a09fb9c7
|
Use the GQL cache for local state
|
2019-12-18 16:23:33 +01:00 |
|
Ramon Wenger
|
54a6a2a702
|
Update package versions
|
2019-12-18 16:16:32 +01:00 |
|
Ramon Wenger
|
a713048b86
|
Add styling for module activity entries
|
2019-12-18 13:18:42 +01:00 |
|
Ramon Wenger
|
b132e320af
|
Fix scrolling to assignments
|
2019-12-18 13:18:17 +01:00 |
|
Ramon Wenger
|
cb13aa1ea5
|
Update my activity in client
|
2019-12-18 13:17:08 +01:00 |
|
Ramon Wenger
|
eba199dc60
|
Add more emojis!
|
2019-12-11 11:04:23 +01:00 |
|
Ramon Wenger
|
388c1f63d7
|
Merged in feature/bookmarks-for-modules-and-chapters (pull request #42)
Feature/bookmarks for modules and chapters
|
2019-12-10 14:09:13 +00:00 |
|
Ramon Wenger
|
dab5d907f3
|
Update mobile navigation styling
|
2019-12-10 14:11:14 +01:00 |
|
Ramon Wenger
|
84bcfdc7cf
|
Add comments
|
2019-12-09 15:44:50 +01:00 |
|
Ramon Wenger
|
d400b2f61c
|
Add todo
|
2019-12-09 15:29:07 +01:00 |
|
Ramon Wenger
|
c2ead4c78d
|
Add cypress test
|
2019-12-09 15:18:47 +01:00 |
|
Ramon Wenger
|
3dc778d41b
|
Fix cypress tests
|
2019-12-09 11:14:34 +01:00 |
|
Christian Cueni
|
92d03dbe50
|
Merged in feature/feedback (pull request #41)
Feature/feedback
|
2019-12-09 10:04:27 +00:00 |
|
Ramon Wenger
|
89e3925590
|
Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
|
2019-12-09 10:30:49 +01:00 |
|
Ramon Wenger
|
3f66ce5a0f
|
Add notes to chapters and modules
|
2019-12-05 14:39:50 +01:00 |
|
Ramon Wenger
|
f6f61aaf05
|
Add bookmark action for modules
|
2019-12-03 15:06:47 +01:00 |
|
Ramon Wenger
|
a06f32bcb0
|
Add bookmark action to chapter
|
2019-12-03 14:03:30 +01:00 |
|
Christian Cueni
|
84a69b24f1
|
Incoorperate feedback
|
2019-12-02 17:12:19 +01:00 |
|
Ramon Wenger
|
7c534cbe5c
|
Add first raw implementation for adtl. bookmark types
|
2019-12-02 13:56:52 +01:00 |
|
Ramon Wenger
|
f7213b44e7
|
Always close the mobile navigation on router link click
|
2019-11-28 15:34:42 +01:00 |
|
Ramon Wenger
|
88bbd505f0
|
Add instruments to mobile subnavigation
|
2019-11-26 16:57:22 +01:00 |
|
Ramon Wenger
|
9e3a7d1607
|
Add topics to mobile navigation
|
2019-11-26 16:43:23 +01:00 |
|
Ramon Wenger
|
2913796a1b
|
Add Thinglink block to frontend views
|
2019-11-26 09:31:39 +01:00 |
|
Christian Cueni
|
7641e5dcaa
|
Add logout button
|
2019-11-21 12:35:42 +01:00 |
|
Ramon Wenger
|
42f888d0d6
|
Change bookmark icon color
|
2019-11-20 15:47:41 +01:00 |
|
Christian Cueni
|
735eae25e3
|
Handle submissions with no feedback
|
2019-11-19 15:32:13 +01:00 |
|
Christian Cueni
|
3e606073e2
|
Refactor emojis
|
2019-11-19 12:59:18 +01:00 |
|
Christian Cueni
|
066f5259ce
|
Refactor submission form
|
2019-11-19 10:25:24 +01:00 |
|
Christian Cueni
|
a732074a9b
|
Add feedback in student view
|
2019-11-18 17:42:53 +01:00 |
|
Christian Cueni
|
d0b8ca7ac7
|
Style final an non-final feedbacks
|
2019-11-18 16:35:06 +01:00 |
|
Christian Cueni
|
714cb713b1
|
Style submission page
|
2019-11-18 15:31:42 +01:00 |
|
Christian Cueni
|
6bdce35f7f
|
Style submissions page
|
2019-11-18 15:15:25 +01:00 |
|
Christian Cueni
|
662071d066
|
Handle form updates
|
2019-11-18 13:46:27 +01:00 |
|
Christian Cueni
|
a2af5759bb
|
Add emojis
|
2019-11-18 11:12:09 +01:00 |
|
Christian Cueni
|
6b739034de
|
Refactor feedback form and final submission
|
2019-11-14 14:36:20 +01:00 |
|
Christian Cueni
|
d3a81e17d8
|
Add Feedback container component
|
2019-11-14 11:11:58 +01:00 |
|
Christian Cueni
|
ad07ada2f2
|
Add feedback to submission view, style view
|
2019-11-13 19:25:24 +01:00 |
|
Christian Cueni
|
4965eb5fa1
|
Add login link to registration
|
2019-11-12 10:49:09 +01:00 |
|
Christian Cueni
|
d163f1b88a
|
Comment test
|
2019-11-11 18:19:35 +01:00 |
|
Christian Cueni
|
e2f5c0b3f0
|
Fix copy, fix styles on server
|
2019-11-11 18:19:35 +01:00 |
|
Christian Cueni
|
c84a87fc7f
|
Keep cypress fail videos
|
2019-11-11 18:19:35 +01:00 |
|
Christian Cueni
|
193c1d39b5
|
Style no class page, change admin display
|
2019-11-11 18:19:35 +01:00 |
|
Christian Cueni
|
06dbf20094
|
Add no-class page & guard
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
b20917d29a
|
Validate license on login
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
bceb01c5f4
|
Add and update tests, add dummy data
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
148b2cae3d
|
Init password reset after registration
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
836cd63cfd
|
Style inputs, make registration page public
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
f3ae0fec7e
|
Display server errors
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
436a9b891f
|
Add registration component
|
2019-11-11 18:19:34 +01:00 |
|
Christian Cueni
|
95d1c4708a
|
Merge branch 'develop' into feature/highlight-proof-of-concept
# Conflicts:
# client/src/components/ContentBlock.vue
|
2019-11-06 08:17:40 +01:00 |
|
Christian Cueni
|
a623a13c1d
|
Hide bookmark actions for mobile
|
2019-11-05 11:04:29 +01:00 |
|
Christian Cueni
|
2d39ee8775
|
Hide bookmark actions in edit mode
|
2019-11-04 16:29:30 +01:00 |
|
Ramon Wenger
|
9b1c54cad2
|
Add optimistic update for the new note wizard
|
2019-10-28 15:21:06 +01:00 |
|
Ramon Wenger
|
c346cfef3f
|
Fix positioning of bookmark icons
|
2019-10-28 10:58:33 +01:00 |
|
Ramon Wenger
|
081f567334
|
Update content block optimistically
|
2019-10-24 16:22:41 +02:00 |
|
Ramon Wenger
|
91c278cae7
|
Remove module edit toggle from submissions page
|
2019-10-24 15:01:31 +02:00 |
|
Christian Cueni
|
38777cf914
|
Merged in feature/move-login (pull request #37)
Feature/move login
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2019-10-23 06:58:46 +00:00 |
|
Christian Cueni
|
81d89dae9a
|
Change css names, refactor login guard
|
2019-10-23 08:33:37 +02:00 |
|
Ramon Wenger
|
1c2e0fc88b
|
Add Thinglink block
|
2019-10-22 17:06:46 +02:00 |
|
Ramon Wenger
|
9b2db99d0b
|
Make bookmarks work with content list blocks
|
2019-10-22 14:29:58 +02:00 |
|
Ramon Wenger
|
d061116585
|
Add fixmes
|
2019-10-15 16:21:44 +02:00 |
|
Ramon Wenger
|
4fc896c224
|
Check for valid bookmark property
|
2019-10-15 13:47:02 +02:00 |
|
Ramon Wenger
|
1d5603ed5f
|
Add note update mutation
|
2019-10-12 08:54:20 +02:00 |
|
Ramon Wenger
|
62460d58ab
|
Add node for notes
|
2019-10-12 08:52:23 +02:00 |
|
Ramon Wenger
|
67cfc4b572
|
Add modal for adding notes
|
2019-10-10 09:50:27 +02:00 |
|
Ramon Wenger
|
95bc633cfb
|
Fix unit test
|
2019-10-08 19:22:12 +02:00 |
|
Ramon Wenger
|
2656829d86
|
Add new bookmark component and some icons
|
2019-10-08 18:37:16 +02:00 |
|
Christian Cueni
|
2eae460b31
|
Fix integration test
|
2019-10-08 14:35:48 +02:00 |
|
Christian Cueni
|
0694471270
|
Fix test, cleanup 🛁
|
2019-10-08 13:41:09 +02:00 |
|
Christian Cueni
|
c396c34be2
|
Hide registration, redirect to correct page after reset, style reset
|
2019-10-08 10:14:57 +02:00 |
|
Christian Cueni
|
31de68e3d0
|
Use app logout
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
e93dde272d
|
Update tests
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
80b1d38b93
|
Style public pages, add links to login page
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
a1954e00c5
|
Update integration tests
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
57224d228a
|
Style default layout, style login
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
9783bd802a
|
Redirect user to visited page after login
|
2019-10-08 09:30:00 +02:00 |
|
Christian Cueni
|
062269f030
|
Add loggedIn guard, add basic login component
|
2019-10-08 09:30:00 +02:00 |
|
Ramon Wenger
|
5fd81a2bd6
|
Rename Highlight to Bookmark
|
2019-10-07 17:10:39 +02:00 |
|
Ramon Wenger
|
9837248881
|
Fix unit test
|
2019-10-02 14:57:52 +02:00 |
|
Ramon Wenger
|
4247164067
|
Add highlight mutation
|
2019-10-02 11:39:40 +02:00 |
|
Ramon Wenger
|
584b48a6a6
|
Add notes app and a PoC for highlights
|
2019-10-02 11:38:53 +02:00 |
|
Ramon Wenger
|
90598342b8
|
Move content block content handling to own component
|
2019-10-02 11:36:59 +02:00 |
|
Ramon Wenger
|
2c665399b6
|
Add survey save button text
|
2019-09-17 17:51:02 +02:00 |
|
Ramon Wenger
|
64bf100a19
|
Save user answers in surveys on page change
|
2019-09-17 10:12:28 +02:00 |
|
Ramon Wenger
|
e940066db8
|
Display solutions for teachers always
|
2019-09-16 14:02:28 +02:00 |
|
Christian Cueni
|
e551bdbdbd
|
Merged in feature/fix-css-numbering (pull request #36)
Remove css numbering, use JS instead
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2019-09-12 14:34:09 +00:00 |
|
Christian Cueni
|
3a19f1a0b5
|
Remove css numbering, use JS instead
|
2019-09-12 10:35:49 +02:00 |
|
Ramon Wenger
|
23936ec6ae
|
Fix bug where surveys don't retain answers without reloading
|
2019-09-12 09:08:16 +02:00 |
|
Christian Cueni
|
5c2ed30ccf
|
Merged in feature/fix-numbering (pull request #35)
Fix content list numbering
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2019-09-11 14:01:35 +00:00 |
|
Christian Cueni
|
03f418df38
|
Fix content list numbering
|
2019-09-11 14:45:31 +02:00 |
|
Ramon Wenger
|
4ae9c5813f
|
Merged in feature/survey-with-correct-answer (pull request #34)
Feature/survey with correct answer
Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
|
2019-09-11 11:02:37 +00:00 |
|
Ramon Wenger
|
b2e133542c
|
Fix cypress test
|
2019-09-09 16:00:35 +02:00 |
|
Ramon Wenger
|
0a4269aaad
|
Change news link to use SSL
|
2019-09-09 14:09:27 +02:00 |
|
Ramon Wenger
|
e10b577ac1
|
Add solution visibility check to survey
|
2019-09-09 14:04:47 +02:00 |
|
Ramon Wenger
|
371c5cd276
|
Refactor code to be clearer
|
2019-09-09 11:07:45 +02:00 |
|
Ramon Wenger
|
fd54e22430
|
Remove news subnavigation item
|
2019-09-06 15:55:38 +02:00 |
|
Ramon Wenger
|
8993f3f72b
|
Add new news entry, re-enable news footer
|
2019-09-06 15:53:09 +02:00 |
|
Ramon Wenger
|
232e5246b4
|
Move objective border to the right spot
|
2019-09-06 15:46:39 +02:00 |
|
Ramon Wenger
|
bddeeba74e
|
Remove menu from user widget where not necessary
|
2019-09-06 15:42:13 +02:00 |
|
Ramon Wenger
|
aeab246aee
|
Add solutions to survey
|
2019-09-05 15:22:01 +02:00 |
|
Christian Cueni
|
2c5b49a4f2
|
Remove comment
|
2019-09-05 08:52:27 +02:00 |
|
Christian Cueni
|
117782a337
|
Add continuos numbering for content lists
|
2019-09-05 08:31:38 +02:00 |
|
Ramon Wenger
|
65663491b0
|
Add rudimentary answer display to survey page
|
2019-09-04 15:18:37 +02:00 |
|
Ramon Wenger
|
fb671cbc2d
|
Update cypress version
|
2019-09-04 15:17:56 +02:00 |
|
Ramon Wenger
|
0bcdcf9941
|
Merged in feature/objectives-by-class (pull request #32)
Feature/objectives by class
|
2019-08-26 13:12:34 +00:00 |
|
Christian Cueni
|
a9de457e35
|
Add computed property for permission check
|
2019-08-26 14:49:05 +02:00 |
|
Christian Cueni
|
919c9876d6
|
Add package to dependencies
|
2019-08-26 14:28:59 +02:00 |
|
Christian Cueni
|
d7b977ba06
|
Merged in feature/jest-tests (pull request #31)
Feature/jest tests
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2019-08-26 11:32:15 +00:00 |
|
Christian Cueni
|
a4d19cbfe6
|
Fix typo
|
2019-08-26 13:19:32 +02:00 |
|
Ramon Wenger
|
046599af81
|
Hide hidden objectives when not in edit mode
|
2019-08-26 11:25:46 +02:00 |
|
Ramon Wenger
|
6020da8598
|
Add action menu and delete method to objectives
|
2019-08-26 11:15:25 +02:00 |
|
Ramon Wenger
|
6d5fa1806d
|
Enable teachers to add new objectives instead of objective groups
|
2019-08-22 19:01:26 +02:00 |
|
Ramon Wenger
|
76b3f70a87
|
Hide single objectives instead of whole groups
|
2019-08-21 16:26:51 +02:00 |
|
Christian Cueni
|
29a0ec5aef
|
Hide news
|
2019-08-14 13:31:21 +02:00 |
|
Christian Cueni
|
c2985d663a
|
Make layout styles scoped
|
2019-08-14 11:52:44 +02:00 |
|
Christian Cueni
|
2fa006d790
|
Rename block, update frontend
|
2019-08-14 11:52:44 +02:00 |
|
Christian Cueni
|
8c42daca7f
|
Update copy, fix widget height
|
2019-08-13 11:25:38 +02:00 |
|
Christian Cueni
|
3918d170f9
|
Add jest to all tests
|
2019-08-13 11:10:01 +02:00 |
|
Christian Cueni
|
8f1ee79347
|
Add jest tests
|
2019-08-13 10:57:11 +02:00 |
|
Christian Cueni
|
4ecb7a8c2b
|
Use assignments from chapters for list generation
|
2019-08-13 09:15:37 +02:00 |
|
Ramon Wenger
|
cb76318601
|
Re-add solution toggle to module navigation bar
|
2019-07-31 17:11:15 +02:00 |
|
Ramon Wenger
|
5bdf5d53ee
|
Update survey styling
|
2019-07-31 16:00:16 +02:00 |
|
Ramon Wenger
|
4d300e92eb
|
Add custom style for dropdowns
|
2019-07-31 15:33:00 +02:00 |
|
Ramon Wenger
|
99c39b1b69
|
Update and normalize meta title style
|
2019-07-31 15:31:27 +02:00 |
|
Ramon Wenger
|
9e118720b0
|
Add missing margins
|
2019-07-31 14:04:13 +02:00 |
|
Ramon Wenger
|
4eea9c3a2c
|
Normalize line height for headings
|
2019-07-31 14:03:39 +02:00 |
|
Ramon Wenger
|
c577cc6c1a
|
Update survey styling for 'completed' page
|
2019-07-31 10:59:30 +02:00 |
|
Ramon Wenger
|
46474db70d
|
Fix content block delete bug
|
2019-07-31 10:36:38 +02:00 |
|
Ramon Wenger
|
5e2ddf69b8
|
Fix filter on assignments with submissions page
Student submissions were not displayed because of a wrong filter. They
are now displayed again.
|
2019-07-29 15:26:57 +02:00 |
|
Ramon Wenger
|
0b0942ba4b
|
Display the assignment text, not the title for assignment submission
page
|
2019-07-29 11:28:21 +02:00 |
|
Ramon Wenger
|
5ae47029a3
|
Hide content blocks for teachers when not in edit mode
|
2019-07-29 11:09:51 +02:00 |
|
Ramon Wenger
|
4483175dbe
|
Hide module subnavigation for students
|
2019-07-29 10:53:31 +02:00 |
|
Ramon Wenger
|
fae0043138
|
Only display edit actions for content block when edit mode is on
|
2019-07-29 10:34:12 +02:00 |
|
Ramon Wenger
|
981302192c
|
Fix content block bug
|
2019-07-29 09:40:12 +02:00 |
|
Ramon Wenger
|
04cfa18853
|
Add user widget to custom content blocks
|
2019-07-25 17:05:59 +02:00 |
|
Ramon Wenger
|
d93ffe1534
|
Add actions for custom content blocks
|
2019-07-25 16:57:59 +02:00 |
|
Christian Cueni
|
deabbf328f
|
Use UserMetaWidget
|
2019-07-25 11:43:51 +02:00 |
|
Christian Cueni
|
780602dfd2
|
Add option for mobile
|
2019-07-25 11:43:51 +02:00 |
|
Christian Cueni
|
638bea0cd0
|
Use cache to propagate changes, add tests, style popover
|
2019-07-25 11:43:51 +02:00 |
|
Christian Cueni
|
91967ceb21
|
Add mutations and query, fix popover
|
2019-07-25 11:43:51 +02:00 |
|
Christian Cueni
|
90b919c839
|
Add class selection widget
|
2019-07-25 11:43:51 +02:00 |
|
Christian Cueni
|
ea9822562a
|
Use popover in user widget
|
2019-07-25 11:43:51 +02:00 |
|
Ramon Wenger
|
b19419af69
|
Normalize heading font size in survey panels
|
2019-07-25 11:12:24 +02:00 |
|
Ramon Wenger
|
ee89522b99
|
Update panel styling in surveys
|
2019-07-25 10:54:18 +02:00 |
|
Ramon Wenger
|
18b6079d26
|
Merged in feature/content-actions (pull request #29)
Feature/content actions
Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
|
2019-07-25 08:15:02 +00:00 |
|
Ramon Wenger
|
0c2cc090e2
|
Add comment to unreadable code block
|
2019-07-25 09:52:26 +02:00 |
|
Ramon Wenger
|
b2ae3dce23
|
Add style to subnavigation
|
2019-07-24 15:32:11 +02:00 |
|
Ramon Wenger
|
fa72d8f5b8
|
Add button to reopen survey
|
2019-07-24 15:22:53 +02:00 |
|
Ramon Wenger
|
c81bcbd26b
|
Add survey block to content block in back- and frontend
|
2019-07-24 14:23:27 +02:00 |
|
Ramon Wenger
|
a34313932f
|
Add lead paragraph styling to chapter description
|
2019-07-24 11:38:47 +02:00 |
|
Ramon Wenger
|
185cd4a81e
|
Remove visibility popover, add eye icon button
|
2019-07-24 11:28:46 +02:00 |
|
Ramon Wenger
|
c479d0f2bf
|
Only show module edit checkbox for teacher
|
2019-07-24 11:19:39 +02:00 |
|
Ramon Wenger
|
824e5b9357
|
Remove obsolete content block action icons
|
2019-07-24 10:29:02 +02:00 |
|
Ramon Wenger
|
a4cf7a0d62
|
Add toggle for module editing
|
2019-07-23 16:04:23 +02:00 |
|
Ramon Wenger
|
8bd6d51028
|
Add new SVGs for icons
|
2019-07-23 15:59:53 +02:00 |
|
Ramon Wenger
|
e422d29759
|
Fix position of top filter
|
2019-07-23 14:26:05 +02:00 |
|
Ramon Wenger
|
648a3e9229
|
Fix survey cypress test
|
2019-07-23 12:05:16 +02:00 |
|
Christian Cueni
|
162b988998
|
Skip solution test
|
2019-07-23 11:32:46 +02:00 |
|
Ramon Wenger
|
062d799c4c
|
Set locale on survey
|
2019-07-23 11:14:02 +02:00 |
|
Ramon Wenger
|
48ee15850f
|
Merged in feature/old-surveyjs-styling (pull request #27)
Feature/old surveyjs styling
Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
|
2019-07-23 08:33:37 +00:00 |
|
Ramon Wenger
|
c537fd37aa
|
Add more styling
|
2019-07-22 16:27:59 +02:00 |
|
Ramon Wenger
|
d8f4077d63
|
Fix typo
|
2019-07-22 14:42:07 +02:00 |
|
Ramon Wenger
|
eda5653477
|
Always display survey title from JSON, never from model
|
2019-07-22 11:36:08 +02:00 |
|
Ramon Wenger
|
3a64365f7d
|
Replace values with a variable
|
2019-07-18 16:33:21 +02:00 |
|
Christian Cueni
|
81315e9848
|
Hide filters
|
2019-07-18 15:36:16 +02:00 |
|
Ramon Wenger
|
b84059adf5
|
Add checkbox styling
|
2019-07-18 15:13:58 +02:00 |
|
Ramon Wenger
|
d5a63a0c7e
|
Add styling for survey progress bar
|
2019-07-18 15:01:55 +02:00 |
|
Ramon Wenger
|
a9b10fdf88
|
Add radiobutton styling to survey
|
2019-07-18 14:55:46 +02:00 |
|
Ramon Wenger
|
dd1bf56f49
|
Fix subnavigation styling
|
2019-07-18 10:20:52 +02:00 |
|
Christian Cueni
|
a1234f6688
|
Merged in feature/nested-block (pull request #26)
Feature/nested block
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2019-07-17 15:14:57 +00:00 |
|
Christian Cueni
|
cc55dbdf69
|
Fix subtitle and genially blocks in instruments
|
2019-07-17 15:11:43 +02:00 |
|
Christian Cueni
|
7419ab72c4
|
Push that pixel 👨🎨
|
2019-07-17 11:49:32 +02:00 |
|
Christian Cueni
|
599344e4be
|
Augment fields in content list item
|
2019-07-17 11:33:20 +02:00 |
|
Ramon Wenger
|
12b580a94a
|
Hide subnavigation on navigation
|
2019-07-17 11:26:33 +02:00 |
|
Ramon Wenger
|
dae832b98d
|
Add navigation to and from instrument overview
|
2019-07-17 11:20:01 +02:00 |
|
Ramon Wenger
|
bd17543ec2
|
Add teaser helper function
|
2019-07-17 09:54:34 +02:00 |
|
Ramon Wenger
|
cd6ff31cef
|
Add instrument query to instrument overview
|
2019-07-17 09:54:34 +02:00 |
|
Ramon Wenger
|
2a4cf56825
|
Refactor some more occurences of basic knowledge to instrument
|
2019-07-17 09:54:34 +02:00 |
|
Ramon Wenger
|
98a8acac4f
|
Refactor subnavigation and implement module subnavigation
|
2019-07-16 16:15:20 +02:00 |
|
Ramon Wenger
|
d788466942
|
Rename some components
|
2019-07-16 16:12:04 +02:00 |
|
Christian Cueni
|
251c05abad
|
Treat single content items as blocks
|
2019-07-16 11:45:00 +02:00 |
|
Christian Cueni
|
2905486c2f
|
Remove content list in wagtail, add content list in frontend
|
2019-07-16 09:36:43 +02:00 |
|
Ramon Wenger
|
3820256872
|
Fix css bug
|
2019-07-15 18:18:42 +02:00 |
|
Christian Cueni
|
8f0e0f9fe7
|
Hide nested content's title
|
2019-07-15 14:13:10 +02:00 |
|
Christian Cueni
|
defce01a3f
|
Remove log messages
|
2019-07-15 13:05:42 +02:00 |
|
Christian Cueni
|
a41947e951
|
Add content list block component
|
2019-07-15 13:00:32 +02:00 |
|
Ramon Wenger
|
33a4f9e2c1
|
Merged in feature/new-assignment-design (pull request #21)
Feature/new assignment design
Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
|
2019-07-15 08:35:44 +00:00 |
|
Ramon Wenger
|
b7e4d3eb53
|
Clean up code
|
2019-07-11 18:50:31 +02:00 |
|
Ramon Wenger
|
c5fea80ab4
|
Add single button file upload
|
2019-07-11 16:19:06 +02:00 |
|
Christian Cueni
|
e3c7cc77a9
|
Merged in feature/instruments (pull request #20)
Change default set for rich text, add blocks
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2019-07-11 12:25:20 +00:00 |
|
Ramon Wenger
|
6710f51b64
|
Adjust style of assignment input
|
2019-07-11 14:13:28 +02:00 |
|
Ramon Wenger
|
d768087b2e
|
Add auto grow directive to textarea
|
2019-07-11 13:55:39 +02:00 |
|
Christian Cueni
|
707909761e
|
Change default set for rich text, add blocks
|
2019-07-11 10:49:54 +02:00 |
|
Christian Cueni
|
7339e72c1e
|
Fix html
|
2019-07-11 10:46:04 +02:00 |
|
Christian Cueni
|
7bdeb4b6f5
|
Add import
|
2019-07-11 10:43:04 +02:00 |
|
Christian Cueni
|
1f72d4757f
|
Change boldest font weight
|
2019-07-11 10:42:33 +02:00 |
|
Christian Cueni
|
2eb3fec0bb
|
Use variables and mixins
|
2019-07-11 10:41:55 +02:00 |
|
Ramon Wenger
|
0ef9298c19
|
Refactor code
|
2019-07-11 10:41:55 +02:00 |
|
Ramon Wenger
|
e1936a33b1
|
Rename constant
|
2019-07-11 10:41:55 +02:00 |
|
Christian Cueni
|
9df8ef6423
|
Change title markup
|
2019-07-11 10:41:55 +02:00 |
|
Christian Cueni
|
adbb6ca4d4
|
Fix margin
|
2019-07-11 10:41:55 +02:00 |
|
Christian Cueni
|
ecba0d84bc
|
Add subtitle to contentblock, style instrument widget
|
2019-07-11 10:41:55 +02:00 |
|
Christian Cueni
|
695a9a8ccb
|
Change grayscale, add border
|
2019-07-11 10:41:55 +02:00 |
|
Christian Cueni
|
03d8ed6712
|
Add subtitle block, update font sizes
|
2019-07-11 10:41:55 +02:00 |
|
Christian Cueni
|
d2dabd6952
|
Update font styles, change width
|
2019-07-11 10:41:55 +02:00 |
|
Ramon Wenger
|
ca17ed42f7
|
Add property check to answer
|
2019-07-08 16:03:55 +02:00 |
|
Ramon Wenger
|
a09bf2786d
|
Save correct answer with answer given by user
|
2019-07-08 15:10:33 +02:00 |
|
Ramon Wenger
|
9dca627465
|
Merged in feature/surveyjs (pull request #17)
Feature/surveyjs
|
2019-07-04 11:31:12 +00:00 |
|
Ramon Wenger
|
e296d500aa
|
Clean up code
|
2019-07-04 10:24:12 +02:00 |
|
Ramon Wenger
|
0e3ed9ea7a
|
Remove year from school class model
|
2019-07-03 11:58:25 +02:00 |
|
Ramon Wenger
|
b498dc4efa
|
Add cypress test for surveys
|
2019-07-01 13:08:42 +02:00 |
|
Ramon Wenger
|
fbe39e2784
|
Add style guide
|
2019-06-27 17:56:49 +02:00 |
|
Ramon Wenger
|
9b85560795
|
Add answers to surveys
|
2019-06-27 17:56:29 +02:00 |
|
Ramon Wenger
|
f9642ff49e
|
Get survey from server and display it dynamically
|
2019-06-27 17:55:07 +02:00 |
|
Ramon Wenger
|
d8e3d24f4a
|
Fix background color bug
|
2019-06-26 13:59:00 +02:00 |
|
Ramon Wenger
|
db4353faa1
|
Remove second objective groups block
|
2019-06-26 09:39:31 +02:00 |
|
Ramon Wenger
|
03623fbcc6
|
Remove header
|
2019-06-25 18:06:24 +02:00 |
|
Ramon Wenger
|
43da8adfa4
|
Change default topic
|
2019-06-24 16:07:42 +02:00 |
|
Ramon Wenger
|
bad289ac3a
|
Rename basic knowledge to instrument in frontend
|
2019-06-24 15:54:38 +02:00 |
|
Ramon Wenger
|
2494245b12
|
Add survey.js demo implementation to frontend
|
2019-06-20 14:51:09 +02:00 |
|
Ramon Wenger
|
590fd180c3
|
Move project and room actions to own component
Also adds those actions to the detail pages of both entity types. Also refactors some code.
|
2019-05-22 17:47:31 +02:00 |
|
Ramon Wenger
|
c7cf6f7863
|
Add document name to room entry preview
|
2019-05-21 14:49:13 +02:00 |
|
Ramon Wenger
|
7bc8c3c3aa
|
Add cypress test for project entry deletion
|
2019-05-21 14:42:06 +02:00 |
|
Ramon Wenger
|
735d2d9afa
|
Add project entry deletion by user
|
2019-05-21 14:39:25 +02:00 |
|
Ramon Wenger
|
d5364d8d9d
|
Re-add intro to module
|
2019-05-21 14:08:30 +02:00 |
|
Ramon Wenger
|
b29de0cf50
|
Fix assignment console bug
|
2019-05-21 11:18:57 +02:00 |
|
Ramon Wenger
|
5432e4c8df
|
Fix scrolling issue
|
2019-05-21 11:18:27 +02:00 |
|
Ramon Wenger
|
78e2e3ecc5
|
Add polling to rooms and portfolio pages
|
2019-05-15 18:21:04 +02:00 |
|
Ramon Wenger
|
8764aee445
|
Add icon to document form
|
2019-05-15 15:34:32 +02:00 |
|
Ramon Wenger
|
caa6736330
|
Handle document upload in image form
|
2019-05-15 15:14:32 +02:00 |
|
Ramon Wenger
|
1417f8fc2d
|
Add long polling to room and project
|
2019-05-14 17:17:24 +02:00 |
|
Ramon Wenger
|
a5b05c5faa
|
Add refresh on room page
|
2019-05-14 09:53:49 +02:00 |
|
Ramon Wenger
|
175b517e75
|
Add form for editing project entries
|
2019-05-13 17:57:21 +02:00 |
|
Ramon Wenger
|
dda9f75011
|
Disable task content block creation for students
|
2019-05-09 10:20:26 +02:00 |
|
Ramon Wenger
|
28f96f8517
|
Force http on links
|
2019-05-09 09:18:21 +02:00 |
|
Ramon Wenger
|
545f3adb41
|
Fix wording
|
2019-05-09 09:13:01 +02:00 |
|
Ramon Wenger
|
c8f02ec6b2
|
Fix room entry widget height
|
2019-05-09 09:12:42 +02:00 |
|
Ramon Wenger
|
bd1286abba
|
Prevent double saving on entity creation
|
2019-05-08 14:42:58 +02:00 |
|
Ramon Wenger
|
e88b9a07db
|
Hide assignment block type on room entry form
|
2019-05-07 15:50:19 +02:00 |
|
Ramon Wenger
|
a0b49a752b
|
Display documents in projects in a more useful manner
|
2019-05-07 15:27:21 +02:00 |
|
Christian Cueni
|
6513da19cf
|
Fix url in cypress test
|
2019-04-25 12:41:19 +02:00 |