 cami
|
8fec13cad4
|
Merge pull request 'feature/cicd' (#134) from feature/cicd into main
continuous-integration/drone/push Build is failing
Reviewed-on: #134
|
2021-07-12 00:13:19 +00:00 |
|
|
cami
|
e81e079727
|
drone experiment
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 02:09:09 +02:00 |
|
|
cami
|
5ab66c1e67
|
removed steps things
|
2021-07-12 02:00:08 +02:00 |
|
|
cami
|
ce74bdeb39
|
..
continuous-integration/drone/push Build is failing
|
2021-07-12 01:58:26 +02:00 |
|
|
cami
|
638a924f96
|
remove autotag
|
2021-07-12 01:52:40 +02:00 |
|
|
cami
|
5bb2aa73e1
|
First drone-thing
continuous-integration/drone/push Build is failing
|
2021-07-12 01:49:21 +02:00 |
|
|
cami
|
aa26855b43
|
Merge pull request 'Add behavior pages (fix #119)' (#130) from feature/behaviourpages into main
Reviewed-on: #130
|
2021-07-11 23:29:57 +00:00 |
|
|
cami
|
92dfa04407
|
Merge pull request 'Removed default login (fix #54)' (#133) from bugfix/remove_default_login into main
Reviewed-on: #133
|
2021-07-11 23:25:38 +00:00 |
|
|
cami
|
42720679ae
|
Removed default login (fix #54)
|
2021-07-12 01:25:07 +02:00 |
|
|
cami
|
84c997f17e
|
started backend with things
|
2021-07-12 01:07:34 +02:00 |
|
|
cami
|
fb5675eebd
|
changed some unused things
|
2021-07-12 01:06:53 +02:00 |
|
|
cami
|
d1d213ac9d
|
Added copy paste things :-)
|
2021-07-12 01:06:23 +02:00 |
|
|
cami
|
ca25e3bcf8
|
renamed to normal
|
2021-07-12 01:05:48 +02:00 |
|
|
cami
|
1691500883
|
Renamed Behavior to behaviorNormal
|
2021-07-12 01:04:50 +02:00 |
|
|
cami
|
8bc7076e86
|
Removed some console.log()
|
2021-07-12 00:14:47 +02:00 |
|
|
cami
|
bf7af89c78
|
Merge pull request 'double click after registering (fix #121)' (#129) from survey/doubleclickprevention into main
Reviewed-on: #129
|
2021-07-11 00:42:28 +00:00 |
|
|
cami
|
e934ae98ec
|
double click after registering (fix #121)
|
2021-07-11 02:40:27 +02:00 |
|
|
cami
|
53140da3d3
|
Merge pull request 'Removed some unused things..' (#128) from refactor/removeunusedthings into main
Reviewed-on: #128
|
2021-07-10 22:41:00 +00:00 |
|
|
cami
|
b213f22c22
|
Removed some unused things..
|
2021-07-11 00:40:27 +02:00 |
|
|
cami
|
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 |
|
|
cami
|
4e2ef3fd4d
|
logout will redirect to startpage (fix #126)
|
2021-07-11 00:35:47 +02:00 |
|
|
cami
|
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 |
|
|
cami
|
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 |
|
|
cami
|
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 |
|
|
cami
|
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 |
|
|
cami
|
dccd2fd2ae
|
Added some things :-)
|
2021-07-10 23:49:17 +02:00 |
|
|
cami
|
bd96d0c7fa
|
Merged main into current branch
|
2021-07-10 23:46:00 +02:00 |
|
|
cami
|
d6d42fac57
|
Merge pull request 'CSS and Refactoring' (#124) from frontend/cssRefactoring into main
Reviewed-on: #124
|
2021-07-10 21:45:16 +00:00 |
|
|
cami
|
33f5262eee
|
CSS and Refactoring
- added some css so that everything will become better
- refactored some things
|
2021-07-10 23:44:37 +02:00 |
|
|
cami
|
9e3b08ea95
|
Merged from main branch
|
2021-07-09 01:46:31 +02:00 |
|
|
cami
|
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 |
|
|
cami
|
904c9ae9a5
|
Removed dotted line unter navbar logo when hovering (fix #33)
|
2021-07-09 01:25:45 +02:00 |
|
|
cami
|
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 |
|
|
cami
|
55a9eabc24
|
Added css option to hover all the links (fix #33)
|
2021-07-09 01:19:47 +02:00 |
|
|
cami
|
186025f5df
|
redirection and merge resolve (fix #113)
Reviewed-on: #114
|
2021-07-08 23:06:20 +00:00 |
|
|
cami
|
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 |
|
|
cami
|
232212a5da
|
Merge branch 'main' into feature/logging
|
2021-07-06 02:43:30 +02:00 |
|
|
cami
|
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 |
|
|
cami
|
04cd56e188
|
add register option in navbar
|
2021-07-06 02:41:24 +02:00 |
|
|
cami
|
de2e797bfb
|
merged things..
|
2021-07-06 02:33:10 +02:00 |
|
|
cami
|
13748b6ce5
|
Merge branch 'main' into feature/logging
|
2021-07-06 00:29:08 +00:00 |
|
|
cami
|
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 |
|
|
cami
|
29165ef69a
|
Added text in the survey that the registration was ok
|
2021-07-06 02:24:10 +02:00 |
|
|
cami
|
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 |
|
|
cami
|
c3c87273c4
|
Login error message is better now. (fix #108)
|
2021-07-06 02:17:41 +02:00 |
|
|
cami
|
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 |
|
|
cami
|
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 |
|
|
cami
|
d576ebb404
|
Added further things for logging user interaction
|
2021-07-06 00:58:26 +02:00 |
|
|
cami
|
21b97467aa
|
Added initial start for logging the users behaviour
|
2021-07-05 23:10:21 +02:00 |
|
|
cami
|
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 |
|