|
3965859f0d
|
Removed react scripts
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 22:47:47 +02:00 |
|
|
0ea048048b
|
Merge pull request 'Use prod build for public things' (#143) from cicd2 into main
continuous-integration/drone/push Build is failing
Reviewed-on: #143
|
2021-07-12 20:38:55 +00:00 |
|
|
5d15fbcd3d
|
Use prod build for public things
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 22:38:20 +02:00 |
|
|
a065ce33c8
|
Merge pull request 'update' (#142) from cicd2 into main
continuous-integration/drone/push Build is passing
Reviewed-on: #142
|
2021-07-12 20:25:51 +00:00 |
|
|
e98ae905ce
|
update
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 22:25:17 +02:00 |
|
|
9475e61246
|
Merge pull request 'Update context' (#141) from cicd2 into main
continuous-integration/drone/push Build is failing
Reviewed-on: #141
|
2021-07-12 17:06:19 +00:00 |
|
|
fbbea1a8d1
|
Update context
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
|
2021-07-12 19:05:33 +02:00 |
|
|
8d5bf0f93b
|
Merge pull request 'Changed repos and added context insted of Dockerfile' (#140) from cicd/1 into main
continuous-integration/drone/push Build is failing
Reviewed-on: #140
|
2021-07-12 17:00:07 +00:00 |
|
|
372de2498f
|
Changed repos and added context insted of Dockerfile
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 18:57:15 +02:00 |
|
|
a5791b3f63
|
Merge pull request 'doing things..' (#139) from cicd/1 into main
continuous-integration/drone/push Build is failing
Reviewed-on: #139
|
2021-07-12 00:43:43 +00:00 |
|
|
4266bb2723
|
doing things..
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 02:43:08 +02:00 |
|
|
23e7cb328d
|
Merge pull request 'added things' (#138) from cicd/1 into main
Reviewed-on: #138
|
2021-07-12 00:42:06 +00:00 |
|
|
69ec1d1dab
|
added things
|
2021-07-12 02:41:18 +02:00 |
|
|
9b344c1138
|
Merge pull request 'added backend logging' (#136) from enhancement/cicd into main
continuous-integration/drone/push Build is failing
Reviewed-on: #136
|
2021-07-12 00:36:28 +00:00 |
|
|
504e43258b
|
added backend logging
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 02:36:07 +02:00 |
|
|
649c80b5fc
|
Merge pull request 'doing some things' (#135) from enhancement/cicd into main
continuous-integration/drone/push Build is failing
Reviewed-on: #135
|
2021-07-12 00:34:15 +00:00 |
|
|
123ece89be
|
removed empty things..
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 02:34:01 +02:00 |
|
|
6d044c3271
|
changed names and repos
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 02:27:31 +02:00 |
|
|
c9a01ac68e
|
Two docker files
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 02:24:19 +02:00 |
|
|
8c91f0baaf
|
doing some things
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
|
2021-07-12 02:19:28 +02:00 |
|
|
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 |
|
|
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 |
|
|
5ab66c1e67
|
removed steps things
|
2021-07-12 02:00:08 +02:00 |
|
|
ce74bdeb39
|
..
continuous-integration/drone/push Build is failing
|
2021-07-12 01:58:26 +02:00 |
|
|
638a924f96
|
remove autotag
|
2021-07-12 01:52:40 +02:00 |
|
|
5bb2aa73e1
|
First drone-thing
continuous-integration/drone/push Build is failing
|
2021-07-12 01:49:21 +02:00 |
|
|
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 |
|
|
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 |
|
|
42720679ae
|
Removed default login (fix #54)
|
2021-07-12 01:25:07 +02:00 |
|
|
84c997f17e
|
started backend with things
|
2021-07-12 01:07:34 +02:00 |
|
|
fb5675eebd
|
changed some unused things
|
2021-07-12 01:06:53 +02:00 |
|
|
d1d213ac9d
|
Added copy paste things :-)
|
2021-07-12 01:06:23 +02:00 |
|
|
ca25e3bcf8
|
renamed to normal
|
2021-07-12 01:05:48 +02:00 |
|
|
1691500883
|
Renamed Behavior to behaviorNormal
|
2021-07-12 01:04:50 +02:00 |
|
|
8bc7076e86
|
Removed some console.log()
|
2021-07-12 00:14:47 +02:00 |
|
|
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 |
|
|
e934ae98ec
|
double click after registering (fix #121)
|
2021-07-11 02:40:27 +02:00 |
|
|
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 |
|
|
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 |
|