|
|
b213f22c22
|
Removed some unused things..
|
2021-07-11 00:40:27 +02:00 |
|
|
|
a4a80123c8
|
Merge pull request 'logout will redirect to startpage (fix #126)' (#127) from bugfix/redirectToStartIfLogout into main
Reviewed-on: #127
|
2021-07-10 22:36:20 +00:00 |
|
|
|
4e2ef3fd4d
|
logout will redirect to startpage (fix #126)
|
2021-07-11 00:35:47 +02:00 |
|
|
|
0a5f3eb4d2
|
Merge pull request 'frontend/RemoveUnneccessaryButtons (fix #122 and fix #123)' (#125) from frontend/RemoveUnneccessaryButtons into main
Reviewed-on: #125
|
2021-07-10 22:09:19 +00:00 |
|
|
|
00aa826971
|
Added Button if the user is logged in and css
Added a button if the user is already logged in which will directly go to the study
- make buttons minimal width
|
2021-07-11 00:08:11 +02:00 |
|
|
|
4391cf790c
|
Check if the user is already logged in and do not show all options (fix #122)
|
2021-07-11 00:04:00 +02:00 |
|
|
|
a41b9c2892
|
Merge pull request 'Added initial start for logging the users behaviour' (#104) from feature/logging into main
Reviewed-on: #104
|
2021-07-10 21:50:56 +00:00 |
|
|
|
dccd2fd2ae
|
Added some things :-)
|
2021-07-10 23:49:17 +02:00 |
|
|
|
bd96d0c7fa
|
Merged main into current branch
|
2021-07-10 23:46:00 +02:00 |
|
|
|
d6d42fac57
|
Merge pull request 'CSS and Refactoring' (#124) from frontend/cssRefactoring into main
Reviewed-on: #124
|
2021-07-10 21:45:16 +00:00 |
|
|
|
33f5262eee
|
CSS and Refactoring
- added some css so that everything will become better
- refactored some things
|
2021-07-10 23:44:37 +02:00 |
|
|
|
9e3b08ea95
|
Merged from main branch
|
2021-07-09 01:46:31 +02:00 |
|
|
|
aefb975d26
|
Removed dotted line unter navbar logo when hovering (fix #33) (#118) from bugfix/linkhovering_logo into main
Reviewed-on: #118
|
2021-07-08 23:26:28 +00:00 |
|
|
|
904c9ae9a5
|
Removed dotted line unter navbar logo when hovering (fix #33)
|
2021-07-09 01:25:45 +02:00 |
|
|
|
85f31b17fa
|
Merge pull request 'Added css option to hover all the links (fix #33)' (#117) from bugfix/linkhovering into main
Reviewed-on: #117
|
2021-07-08 23:20:29 +00:00 |
|
|
|
55a9eabc24
|
Added css option to hover all the links (fix #33)
|
2021-07-09 01:19:47 +02:00 |
|
|
|
186025f5df
|
redirection and merge resolve (fix #113)
Reviewed-on: #114
|
2021-07-08 23:06:20 +00:00 |
|
|
|
15b2697622
|
redirection and merge resolve (fix #113)
This commit will add
- redirections to behaviour page
- resolving a merge conflict
|
2021-07-09 01:01:17 +02:00 |
|
|
|
232212a5da
|
Merge branch 'main' into feature/logging
|
2021-07-06 02:43:30 +02:00 |
|
|
|
ab95b0dfd5
|
Merge pull request 'Add registration in the nav bar (fix #111)' (#112) from feature/register-option-navbar into main
Reviewed-on: #112
|
2021-07-06 00:42:21 +00:00 |
|
|
|
04cd56e188
|
add register option in navbar
|
2021-07-06 02:41:24 +02:00 |
|
|
|
de2e797bfb
|
merged things..
|
2021-07-06 02:33:10 +02:00 |
|
|
|
13748b6ce5
|
Merge branch 'main' into feature/logging
|
2021-07-06 00:29:08 +00:00 |
|
|
|
47d8f501df
|
Merge pull request 'Added text in the survey that the registration was ok (fix #106)' (#110) from survey/text into main
Reviewed-on: #110
|
2021-07-06 00:25:06 +00:00 |
|
|
|
29165ef69a
|
Added text in the survey that the registration was ok
|
2021-07-06 02:24:10 +02:00 |
|
|
|
2ac4b987e4
|
Merge pull request 'Login error message is better now. (fix #108)' (#109) from login/fix-error-message into main
Reviewed-on: #109
|
2021-07-06 00:18:10 +00:00 |
|
|
|
c3c87273c4
|
Login error message is better now. (fix #108)
|
2021-07-06 02:17:41 +02:00 |
|
|
|
9341474900
|
Merge pull request 'After the registration user will be logged in and redirected to survey (fix #77 and fix #74)' (#107) from feature/redirect-after-register into main
Reviewed-on: #107
|
2021-07-06 00:13:09 +00:00 |
|
|
|
18f76d8cd6
|
After the registration user will be logged in and redirected to survey (fix #77 and fix #74)
|
2021-07-06 02:12:32 +02:00 |
|
|
|
d576ebb404
|
Added further things for logging user interaction
|
2021-07-06 00:58:26 +02:00 |
|
|
|
21b97467aa
|
Added initial start for logging the users behaviour
|
2021-07-05 23:10:21 +02:00 |
|
|
|
942c22c515
|
Merge pull request 'Refactor the error messages (fix #102)' (#103) from refactor/errormessage into main
Reviewed-on: #103
|
2021-07-05 16:00:35 +00:00 |
|
|
|
b03523cb8d
|
Refactor the error messages (fix #102)
All the errormessages use now the component ErrorMessage as it will be easier like this
|
2021-07-05 18:00:01 +02:00 |
|
|
|
b6ec0948e2
|
Merge pull request 'Add additional feedback during the survey [fix #100]' (#101) from survey/visualfeedback into main
Reviewed-on: #101
|
2021-07-05 15:52:29 +00:00 |
|
|
|
699b6fae52
|
Add backend validation if the survey input is correct
|
2021-07-05 17:51:49 +02:00 |
|
|
|
1ce5b467be
|
Removed unneccessary else statement
|
2021-07-05 01:32:23 +02:00 |
|
|
|
0ecb73cbe7
|
Use const for survey validity and change smaller things
|
2021-07-05 01:19:26 +02:00 |
|
|
|
6e9219fa7c
|
Added frontend validation in the survey without backend
|
2021-07-05 01:07:50 +02:00 |
|
|
|
8ca90625b7
|
Merge pull request 'Added login feedback in the backend [fix #98]' (#99) from login/feedback into main
Reviewed-on: #99
|
2021-07-04 22:03:23 +00:00 |
|
|
|
9cd22e7d7d
|
Added the login feedback in the frontend
|
2021-07-05 00:01:50 +02:00 |
|
|
|
160e4d936e
|
Added login feedback in the backend
|
2021-07-04 23:35:20 +02:00 |
|
|
|
d073c8ea2e
|
Merge pull request 'Give feedback when someone wants to register' (#97) from register/errorText into main
Reviewed-on: #97
|
2021-07-04 21:31:58 +00:00 |
|
|
|
3cbfd949e4
|
Give feedback when someone wants to register
|
2021-07-04 23:31:18 +02:00 |
|
|
|
2648ffc394
|
Merge pull request 'Design/Buttonfontsize' (#96) from design/buttonFontsize into main
|
2021-07-04 19:45:45 +00:00 |
|
|
|
fcdb20e69f
|
Made the font size of buttons more flexible
|
2021-07-04 21:40:27 +02:00 |
|
|
|
23e07b1484
|
Merge pull request 'Format/Autoformat' (#92) from format/autoformat into main
|
2021-06-30 00:15:10 +00:00 |
|
|
|
d047e99113
|
Reformatted all the necessary files
|
2021-06-30 02:14:42 +02:00 |
|
|
|
7755e63c90
|
Merge pull request 'Adjust design for licenses page (close #88)' (#91) from design/licenses into main
Reviewed-on: #91
|
2021-06-29 23:54:11 +00:00 |
|
|
|
a5a76836c5
|
Adjust design for licenses page (close #88)
The design should now be more or less the same as on the other pages. There's still some work to make it more beautiful and more readable (see #90)
|
2021-06-30 01:53:29 +02:00 |
|
|
|
1de6862c2f
|
Merge pull request 'Privacy site now looks the same as other sites (fix #87)' (#89) from design/privacy into main
Reviewed-on: #89
|
2021-06-29 23:38:14 +00:00 |
|
