Commit Graph

213 Commits

Author SHA1 Message Date
1fc3e040e7 merge v2 2020-12-21 16:56:32 +01:00
c1f520fbc5 merge 2020-12-21 16:56:14 +01:00
f426f5029b Change to login to role 2020-12-21 16:54:22 +01:00
b49bdae96a SES-103 WIP 2020-12-21 16:17:14 +01:00
070cafed58 Merge pull request 'SES-105 list of logged charcters' (#36) from SES-105 into dev
Reviewed-on: #36
2020-12-21 13:40:46 +01:00
441e09a12f change login path 2020-12-21 13:40:11 +01:00
0de41a2ce8 Changed method to return characters 2020-12-21 13:30:59 +01:00
8de1b8bb5a Merge branch 'dev' into SES-105 2020-12-21 12:57:25 +01:00
44fdbc9029 Merge pull request 'SES-101 Added Login to Signalr on GM' (#34) from SES-101 into dev
Reviewed-on: #34
2020-12-21 11:25:16 +01:00
9c4b438e9b Merge branch 'dev' into SES-101 2020-12-21 11:16:15 +01:00
6350ad7239 Updating 105 2020-12-20 16:34:37 +01:00
2c302d7f09 remove error response from GetLoggedUsersCharacters 2020-12-20 16:30:15 +01:00
23c19b9acb Merge pull request 'SES-112 Fixed bug with registering the same user multiple times' (#37) from SES-112 into dev
Reviewed-on: #37
2020-12-20 16:02:46 +01:00
d6db2b6b56 Fixed unnecessary call 2020-12-20 15:59:42 +01:00
10cd041d38 Fixed bug with registering the same user multiple times 2020-12-20 15:57:10 +01:00
bf5604871d Add Controller that returns logged characters 2020-12-20 15:46:00 +01:00
11af142a09 Added Service to show character basic properties 2020-12-20 15:45:29 +01:00
e4ce736960 Merge pull request 'added basic mock select character component' (#35) from SES-100 into dev
Reviewed-on: #35
2020-12-19 22:33:38 +01:00
Gawron
1698b66f43 added basic mock select character component 2020-12-19 22:31:38 +01:00
6145d9f594 SES-101 Added Login to Signalr on GM 2020-12-19 18:43:21 +01:00
3d33b981fe Merge pull request 'SES-104 Character Data Seed' (#33) from SES-104 into dev
Reviewed-on: #33
2020-12-18 21:25:30 +01:00
956d7b2a32 Merge branch 'dev' into SES-104 2020-12-18 21:19:54 +01:00
4ddb1a5194 Merge pull request 'SES-107 Added new method to return characters list' (#32) from SES-107 into dev
Reviewed-on: #32
2020-12-18 21:19:13 +01:00
910918d4c5 Merge branch 'dev' into SES-107 2020-12-18 21:19:05 +01:00
a37ebe0e98 Merge pull request 'SES-106 Added new mwthod and changed static fields in Hub to be able to share them in other classes' (#31) from SES-106 into dev
Reviewed-on: #31
2020-12-18 21:17:21 +01:00
6461af2757 SES-104 Character Data Seed 2020-12-18 12:00:36 +01:00
b138651a8f SES-107 Added new method to return characters list 2020-12-18 11:18:48 +01:00
eeb9c2ebe0 SES-106 Added new method in controller 2020-12-18 10:52:48 +01:00
f75e9d96f9 SES-106 changed SignalR static field to be able to share them in other classes 2020-12-18 10:52:37 +01:00
c384b279cb Merge pull request 'Update CharacterController with Either, also small style fix in UserController' (#30) from SES-92 into dev
Reviewed-on: #30
2020-12-16 21:49:35 +01:00
474d01e901 Update CharacterController with Either, also small style fix in UserController 2020-12-15 15:36:23 +01:00
50236f8ea0 Merge pull request 'SES-88 Created User register connection' (#29) from SES-88 into master
Reviewed-on: #29
2020-12-13 19:41:33 +01:00
2b4cd79484 SES-88 Created User register connection 2020-12-13 19:27:28 +01:00
79f6bede98 Merge pull request 'SES-84 Created User registration method' (#27) from SES-84 into master
Reviewed-on: #27
2020-12-13 17:07:55 +01:00
c9a4e7aa0d Merge branch 'master' into SES-84 2020-12-13 13:30:33 +01:00
73f01e8e2c Merge pull request 'SES-89 Connected to backend for login' (#28) from SES-89 into master
Reviewed-on: #28
2020-12-13 13:29:18 +01:00
57759fb91e SES-89 type change 2020-12-13 13:27:45 +01:00
815bd676d1 SES-84 Change type to Either 2020-12-13 13:22:09 +01:00
1412362b79 SES-89 Switched to subscribe 2020-12-13 13:05:08 +01:00
6f8cf6dcb4 UserController.cs change 2020-12-13 12:45:50 +01:00
b9928d6ce0 SES-89 Added api connection service and display error 2020-12-13 11:19:01 +01:00
7b122e160e Merge pull request 'SES-90 Added Game Master component' (#26) from SES-90 into master
Reviewed-on: #26
2020-12-12 19:39:36 +01:00
479fd2114b SES-90 Confilcts resolve 2020-12-12 19:24:18 +01:00
fcfd8665c2 Merge pull request 'SES-86 added Sign Up Component' (#25) from SES-86 into master
Reviewed-on: #25
2020-12-12 19:20:23 +01:00
a4ed6faa05 SES-90 Added Game master component 2020-12-12 19:06:30 +01:00
4ed509bd0a SES-86 added validator into sign in and sing up components, changed styles 2020-12-12 18:51:08 +01:00
0fd20fd2b1 SES-90 Styles changes 2020-12-12 11:16:25 +01:00
530c49f1b7 SES-86 added Sign Up Component 2020-12-12 00:21:06 +01:00
e6b632f8f6 Merge pull request 'SES-87 defined default style, created LoginUI component' (#24) from SES-87 into master
Reviewed-on: #24
2020-12-11 22:08:22 +01:00
e83bc3fa73 Merge branch 'master' into SES-87 2020-12-11 22:05:39 +01:00