 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
|
cd2e5c953e
|
Update instrument dummy data
|
2020-05-07 12:22:43 +02:00 |
|
Ramon Wenger
|
795e5a9ea0
|
Merged in feature/instrument-overview (pull request #60)
Feature/instrument overview
Approved-by: Christian Cueni
|
2020-05-07 10:12:02 +00: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
|
9e940e31d8
|
Allow beta users to keep data after hep registration
|
2020-05-06 08:03:51 +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
|
b7e929e9dd
|
Add patch to test
|
2020-05-04 08:48:37 +02:00 |
|
Christian Cueni
|
268633a81e
|
Merge branch 'feature/licensing' of bitbucket.org:iterativ/skillbox into feature/licensing
|
2020-04-30 16:30:23 +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
|
e147ca65e0
|
Fix date comparison
|
2020-04-30 13:17:33 +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
|
1bc2436a8b
|
Merge branch 'develop' into feature/licensing
# Conflicts:
# server/core/settings.py
# server/core/urls.py
# server/core/views.py
|
2020-04-30 09:49:22 +02:00 |
|
Christian Cueni
|
ebc8d070f6
|
Remove error field from query
|
2020-04-30 09:12:36 +02:00 |
|
Christian Cueni
|
0755d61683
|
Remove error field from query
|
2020-04-30 08:57:47 +02:00 |
|
Christian Cueni
|
d46cc7a177
|
Use remove error field, fix tests
|
2020-04-30 08:49:54 +02:00 |
|
Christian Cueni
|
1ca982dd24
|
Fix settings
|
2020-04-30 07:49:48 +02:00 |
|
Christian Cueni
|
57e7122fef
|
Update ISBN
|
2020-04-30 07:03:56 +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
|
a5a764b559
|
Merge branch 'develop'
|
2020-04-16 17:46:41 +02:00 |
|
Ramon Wenger
|
f9887a3105
|
Add manual prod deploy trigger
|
2020-04-16 17:23:41 +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
|
700b899a23
|
Merged in feature/matrix-solutions (pull request #59)
Parse answers from survey matrix
|
2020-04-14 11:22:04 +00: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
|
dbcad5e0f7
|
Merged in feature/instructions (pull request #58)
Feature/instructions
Approved-by: Christian Cueni
|
2020-04-14 07:33:17 +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
|
8774b8d324
|
Add instructions property to topic model
|
2020-04-10 21:24:15 +02:00 |
|
Ramon Wenger
|
595809a4cb
|
Merged in develop (pull request #56)
Develop
|
2020-04-09 16:23:40 +00:00 |