Christian Cueni
|
b64bd5b614
|
Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop
|
2020-06-16 13:51:31 +02:00 |
Christian Cueni
|
8272eaf117
|
Merged in feature/accept-terms (pull request #64)
Feature/accept terms
Approved-by: Ramon Wenger
|
2020-06-16 11:42:46 +00:00 |
Christian Cueni
|
49cd6e590f
|
Remove trailing comma
|
2020-06-16 13:18:24 +02:00 |
Ramon Wenger
|
a9b3dddd8b
|
Make scroll up button a bit more noticeable
|
2020-06-15 16:01:21 +02:00 |
Ramon Wenger
|
711f67b5eb
|
Add scroll top component
|
2020-06-15 15:06:11 +02:00 |
Christian Cueni
|
1d60a76760
|
Use correct property
|
2020-06-04 13:22:17 +02:00 |
Christian Cueni
|
17d3978c46
|
Fix registration tests
|
2020-06-04 13:21:30 +02:00 |
Christian Cueni
|
3f8c604a0c
|
Remove migrations, rename html properties
|
2020-06-04 13:20:30 +02:00 |
Christian Cueni
|
2313073019
|
Omit failing test
|
2020-06-04 13:19:17 +02:00 |
Christian Cueni
|
995fcf09ad
|
Force checkbox
|
2020-06-04 13:19:17 +02:00 |
Christian Cueni
|
f9d77a5179
|
Change selector
|
2020-06-04 13:19:17 +02:00 |
Christian Cueni
|
a4ac9d57cb
|
Update tests
|
2020-06-04 13:19:17 +02:00 |
Christian Cueni
|
20a6290eb9
|
Update copy
|
2020-06-04 13:19:17 +02:00 |
Christian Cueni
|
d9fd4dac35
|
Enforce terms in proxy
|
2020-06-04 13:19:17 +02:00 |
Christian Cueni
|
012ff7c604
|
Add confirmation field
|
2020-06-04 13:19:17 +02:00 |
Ramon Wenger
|
1e944f3c1b
|
Update styling
|
2020-06-04 13:03:25 +02:00 |
Ramon Wenger
|
9fedebd42c
|
Update topic page
|
2020-06-04 13:02:19 +02:00 |
Ramon Wenger
|
7105082a56
|
Update topic url
|
2020-06-04 12:59:47 +02:00 |
Christian Cueni
|
0b19f6c697
|
Rename app, update css classes
|
2020-06-03 13:25:53 +02:00 |
Ramon Wenger
|
2d5c84e842
|
Update links in navigation
|
2020-06-03 10:57:48 +02:00 |
Ramon Wenger
|
26bb96b025
|
Set fixed dimensions for cross icon
|
2020-06-03 10:57:30 +02:00 |
Christian Cueni
|
7685fb7599
|
Use toRem fn
|
2020-06-03 07:09:06 +02:00 |
Christian Cueni
|
c4943c8975
|
Rename class
|
2020-06-03 07:07:18 +02:00 |
Ramon Wenger
|
f0cf98f80a
|
Remove unused files
|
2020-06-02 16:48:10 +02:00 |
Ramon Wenger
|
b5d9d6a998
|
Refactor handling of mobile view
|
2020-06-02 16:46:58 +02:00 |
Ramon Wenger
|
2ebceec717
|
Implement new sidebar styling
|
2020-06-02 16:46:02 +02:00 |
Ramon Wenger
|
6e77cfe433
|
Update some styles
|
2020-06-02 16:41:08 +02:00 |
Ramon Wenger
|
986809247a
|
Add sidebar component to layouts
|
2020-06-02 16:38:14 +02:00 |
Ramon Wenger
|
283ee0db9b
|
Remove obsolete property from state
|
2020-06-02 16:34:28 +02:00 |
Ramon Wenger
|
5db13e9124
|
Refactor sidebar state to allow for multiple sidebars
|
2020-06-02 09:37:12 +02:00 |
Christian Cueni
|
deeab23088
|
Add link, align date on bottom
|
2020-05-28 13:56:18 +02:00 |
Christian Cueni
|
1437f465de
|
Add tiny font, update date language
|
2020-05-28 08:41:15 +02:00 |
Ramon Wenger
|
6d43226ebb
|
Merge branch 'hotfix/lockdown-news' into develop
|
2020-05-27 18:09:45 +02:00 |
Ramon Wenger
|
8dfc862efb
|
Add new news entry, remove old one
|
2020-05-27 18:07:53 +02:00 |
Ramon Wenger
|
7f118a9161
|
Fix eslint issues
|
2020-05-27 16:24:37 +02:00 |
Christian Cueni
|
12c5bf8d90
|
Format date, style source
|
2020-05-27 11:51:43 +02:00 |
Ramon Wenger
|
93d7a3f959
|
Add environment information to frontend dev server
|
2020-05-27 10:12:18 +02:00 |
Ramon Wenger
|
aad4f1f846
|
Fix Infogram resize bug
|
2020-05-26 15:06:16 +02:00 |
Christian Cueni
|
8ce5401311
|
Add basic grid
|
2020-05-25 15:36:55 +02:00 |
Ramon Wenger
|
07059f63f4
|
Add missing ID
|
2020-05-25 14:45:23 +02:00 |
Ramon Wenger
|
38e99e4747
|
Add and fix some more rules
|
2020-05-25 14:19:12 +02:00 |
Ramon Wenger
|
d6772bb3db
|
Update linter rules and fix them
|
2020-05-25 14:19:12 +02:00 |
Christian Cueni
|
03a8b35466
|
Add source, add tests
|
2020-05-25 12:41:12 +02:00 |
Christian Cueni
|
6933e10a7f
|
Add news page, add field
|
2020-05-20 15:42:50 +02:00 |
Christian Cueni
|
888fb8e7da
|
Merge branch 'hotfix/links' into develop
|
2020-05-14 07:23:10 +02:00 |
Christian Cueni
|
e555dd273f
|
Update footer links
|
2020-05-14 07:22:37 +02:00 |
Christian Cueni
|
fe82410947
|
Remove comment
|
2020-05-12 14:42:49 +02:00 |
Christian Cueni
|
ce299e0f0e
|
Merged in feature/licensing (pull request #50)
Feature/licensing
|
2020-05-12 11:37:17 +00:00 |
Christian Cueni
|
a33609e7b2
|
Fix tests
|
2020-05-12 12:41:22 +02:00 |
Christian Cueni
|
d159876472
|
Rename input variable
|
2020-05-12 11:20:43 +02:00 |
Christian Cueni
|
47129e81a6
|
Clean up code
|
2020-05-12 10:59:22 +02:00 |
Christian Cueni
|
685fa3ff34
|
Use built-in graphql errors
|
2020-05-12 09:56:48 +02:00 |
Christian Cueni
|
edd431671f
|
Remove unused variables, simplify tests
|
2020-05-12 08:11:51 +02:00 |
Ramon Wenger
|
bf3e2db7a9
|
Prevent overwrite bug in student submission feedback form
|
2020-05-07 17:23:50 +02:00 |
Ramon Wenger
|
aaffaf015a
|
Fix room color bug
|
2020-05-07 15:42:28 +02:00 |
Ramon Wenger
|
5aaa854918
|
Refactor filtering on activity pages
|
2020-05-07 12:26:15 +02:00 |
Ramon Wenger
|
6d5e66c469
|
Remove unused code
|
2020-05-07 12:25:41 +02:00 |
Ramon Wenger
|
a883a4f221
|
Clean up code
|
2020-05-07 11:42:44 +02:00 |
Ramon Wenger
|
2ab1073826
|
Remove unused component
|
2020-05-06 18:03:09 +02:00 |
Ramon Wenger
|
e60d88dcf0
|
Replace old instrument overview with new one
|
2020-05-06 16:52:22 +02:00 |
Christian Cueni
|
a0733d1caf
|
Remove unused page, fix password error display
|
2020-05-06 09:04:31 +02:00 |
Christian Cueni
|
b222fc86e4
|
Style pages, remove no-class page
|
2020-05-06 08:37:30 +02:00 |
Christian Cueni
|
490ce15db2
|
Fix public layout
|
2020-05-05 07:04:18 +02:00 |
Christian Cueni
|
5be7428b70
|
Style links
|
2020-05-04 15:22:35 +02:00 |
Christian Cueni
|
4282c9df06
|
Fix beta login tests
|
2020-05-04 12:53:37 +02:00 |
Christian Cueni
|
4dbd0b19ae
|
Change url
|
2020-05-04 11:14:47 +02:00 |
Christian Cueni
|
91c83defb0
|
Fix schema
|
2020-05-04 10:27:55 +02:00 |
Christian Cueni
|
9a2991961c
|
Update schema generation
|
2020-05-04 09:31:44 +02:00 |
Christian Cueni
|
ce1e75b5f0
|
Fix client.js
|
2020-04-30 15:31:09 +02:00 |
Christian Cueni
|
6b76c27c55
|
Merge branch 'develop' into feature/licensing
# Conflicts:
# client/config/dev.env.js
# client/config/prod.env.js
# client/cypress/fixtures/schema.json
# client/cypress/integration/beta-login.spec.js
# client/package-lock.json
# client/src/graphql/client.js
# client/src/layouts/PublicLayout.vue
# client/src/main.js
# client/src/styles/main.scss
# server/core/settings.py
# server/registration/mutations_public.py
# server/users/factories.py
# server/users/models.py
# server/users/schema.py
|
2020-04-30 15:22:55 +02:00 |
Christian Cueni
|
fd619ab47b
|
Fix login error messages
|
2020-04-30 14:17:56 +02:00 |
Christian Cueni
|
0aa1625837
|
Update links, add group_id in customer
|
2020-04-30 12:16:24 +02:00 |
Christian Cueni
|
55f120f1ff
|
Update links to shop
|
2020-04-30 10:54:00 +02:00 |
Christian Cueni
|
ebc8d070f6
|
Remove error field from query
|
2020-04-30 09:12:36 +02:00 |
Christian Cueni
|
d46cc7a177
|
Use remove error field, fix tests
|
2020-04-30 08:49:54 +02:00 |
Christian Cueni
|
d10517b4f5
|
Update env variables
|
2020-04-30 06:49:18 +02:00 |
Christian Cueni
|
b14ed2fb5a
|
Change url, add group_id
|
2020-04-27 08:14:39 +02:00 |
Christian Cueni
|
061959e2ac
|
Test url
|
2020-04-20 15:48:33 +02:00 |
Ramon Wenger
|
a6ccae96fe
|
Fix typos
|
2020-04-17 13:48:32 +02:00 |
Ramon Wenger
|
32ab006abe
|
Standardize font size of buttons
|
2020-04-16 14:40:16 +02:00 |
Ramon Wenger
|
1d6b76dae8
|
Add sponsor links
|
2020-04-16 14:33:26 +02:00 |
Ramon Wenger
|
ea789482e8
|
Add margin to footer
|
2020-04-14 15:57:35 +02:00 |
Ramon Wenger
|
a799160501
|
Update icon
|
2020-04-14 15:53:59 +02:00 |
Ramon Wenger
|
1e5c66fb64
|
Clean up code
|
2020-04-14 12:18:25 +02:00 |
Ramon Wenger
|
10078cde5f
|
Parse answers from survey matrix
|
2020-04-14 10:43:27 +02:00 |
Ramon Wenger
|
5da7665f79
|
Merged in feature/footers (pull request #57)
Feature/footers
Approved-by: Christian Cueni
|
2020-04-14 07:34:18 +00:00 |
Ramon Wenger
|
dcd9f0a92c
|
Add instruction block inside content block
|
2020-04-12 23:06:49 +02:00 |
Ramon Wenger
|
c1ac3e779f
|
Add instructions to client
|
2020-04-10 21:28:39 +02:00 |
Ramon Wenger
|
159aef3075
|
Add logos
|
2020-04-09 17:09:01 +02:00 |
Ramon Wenger
|
299f4aad5b
|
Add new footers
|
2020-04-09 16:26:53 +02:00 |
Ramon Wenger
|
9bf7f2e9fa
|
Merged feature/new-favicons into develop
|
2020-04-09 09:57:46 +02:00 |
Ramon Wenger
|
bf7cf24457
|
Adjust matrix styling
|
2020-04-08 17:19:13 +02:00 |
Ramon Wenger
|
04ae5a22a8
|
Add new favicons
|
2020-04-08 14:16:03 +02:00 |
Ramon Wenger
|
a834523c54
|
Merged in feature/matrix (pull request #55)
Feature/matrix
Approved-by: Christian Cueni
|
2020-04-08 09:33:37 +00:00 |
Ramon Wenger
|
2af1714044
|
Clean up code
|
2020-04-08 11:22:41 +02:00 |
Ramon Wenger
|
dc66293684
|
Add interdisciplinary instrument
|
2020-04-08 10:50:06 +02:00 |
Ramon Wenger
|
1a8e28c114
|
Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop
|
2020-04-07 16:18:58 +02:00 |
Ramon Wenger
|
4c149eb48e
|
Update styles
|
2020-04-07 16:17:11 +02:00 |
Ramon Wenger
|
4047edff0a
|
Add matrix styling in surveys
|
2020-04-07 15:55:04 +02:00 |
Ramon Wenger
|
533cf186ee
|
Update surveyjs version
|
2020-04-07 12:04:10 +02:00 |