Commit Graph

288 Commits

Author SHA1 Message Date
a7aaacb2e5 SES-116 Update icons rmd and package json 2020-12-30 11:41:24 +01:00
f75e20876b SES-116 Fix Icons on right panel 2020-12-30 11:38:58 +01:00
85dc9920fa Merge pull request 'SES-115' (#44) from SES-115 into dev
Reviewed-on: #44
2020-12-29 15:31:51 +01:00
18d1b75c4a connected with backend - select character 2020-12-28 17:39:55 +01:00
665ef65ec0 conneted with backend - get user characters list 2020-12-28 17:03:53 +01:00
7b430e05cb SES-116 Database update and icons fix 2020-12-28 14:59:42 +01:00
d61c3f620f added pointer class, updated mockup character list 2020-12-28 13:38:45 +01:00
9477b7346b merge 2020-12-28 11:28:08 +01:00
7e083c3024 Merge pull request 'SES-114 Adder Errors to register view and user can no longer register with two different passwords' (#40) from SES-114 into dev
Reviewed-on: #40
2020-12-27 22:13:16 +01:00
6dc97aa9c3 Merge branch 'dev' into SES-114 2020-12-27 22:12:48 +01:00
2126eabe75 Merge pull request 'SES-123' (#41) from SES-123 into dev
Reviewed-on: #41
2020-12-27 22:05:59 +01:00
2a5e04bbd1 SES-116 Get lsit of logged characters 2020-12-27 21:17:19 +01:00
fe5921fa57 SES-116 Small fix on backend 2020-12-27 21:17:00 +01:00
4b0382a931 SES-121 Added spells tables 2020-12-27 20:08:19 +01:00
89c25d4342 SES-119 Added items tables 2020-12-27 19:47:13 +01:00
e17e3ace58 SES-123 Added reducers and miissed unsubscribe 2020-12-27 17:55:28 +01:00
b82393a62b SES-123 Lint errors fix 2020-12-27 16:33:02 +01:00
607145f45f Icon module register 2020-12-27 16:25:12 +01:00
b9c44c9120 SES-123 Icons module added 2020-12-27 16:25:00 +01:00
004619d6dd SES-114 Adder Errors to register view and user can no longer register with two different passwords 2020-12-23 13:06:01 +01:00
9826e57e7f Merge pull request 'added e2e test - zad.3 lab 9' (#39) from frontend-tests into dev
Reviewed-on: #39
2020-12-21 20:39:22 +01:00
d6da8436bc Merge branch 'dev' into frontend-tests 2020-12-21 20:38:29 +01:00
e47ba17121 added e2e test - zad.3 lab 9 2020-12-21 20:36:32 +01:00
e5196c3513 Tests added 2020-12-21 18:08:51 +01:00
e1c0c66b1b Merge pull request 'SES-103' (#38) from SES-103 into dev
Reviewed-on: #38
2020-12-21 17:00:10 +01:00
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