Commit Graph

1352 Commits

Author SHA1 Message Date
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 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
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
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 b26fdf3023 Merged in feature/interdisciplinary-instrument (pull request #54)
Add interdisciplinary instrument

Approved-by: Christian Cueni
2020-04-08 09:23:15 +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 419c5b78a1 Add real force parameter this time 2020-04-07 17:29:03 +02:00
Ramon Wenger f1257d925f Add force parameter to dev deployment step 2020-04-07 16:27:48 +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 e9d1552505 Merged in feature/editor-plugins (pull request #53)
Add additional editor plugins for instrument WYSIWYG editor

Approved-by: Christian Cueni
2020-04-07 14:05:44 +00: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
Ramon Wenger e340c91a12 Add dev deployment step to all branches 2020-04-07 12:01:40 +02:00
Ramon Wenger 38f0b64d96 Add deployment info to pipelines config 2020-04-07 11:28:47 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger 42960f531d Add new icon 2020-04-02 23:02:26 +02:00
Ramon Wenger ad3e3fa629 Add additional pipeline test settings 2020-04-02 16:20:42 +02:00
Ramon Wenger 68b751d325 Add matomo sanity check 2020-04-01 17:45:07 +02:00
Ramon Wenger a42201d876 Add matomo config 2020-04-01 17:25:59 +02:00
Ramon Wenger 7a84c2f043 Fix default class name generation 2020-04-01 09:37:54 +02:00
Ramon Wenger 4cf8a6fe27 Merged in develop (pull request #52)
Develop
2020-03-30 18:48:22 +00:00