Commit Graph

310 Commits

Author SHA1 Message Date
0223cfd4d1 Merge pull request 'SES-124' (#48) from SES-124 into dev
Reviewed-on: #48
2021-01-02 20:39:36 +01:00
4e6ecf39b9 Merge branch 'dev' into SES-124 2021-01-02 20:37:25 +01:00
9781b5da1f SES-124 display component, small changes 2021-01-02 20:36:55 +01:00
c59e4b3814 Merge pull request 'SES-120' (#47) from SES-120 into dev
Reviewed-on: #47
2021-01-02 20:03:31 +01:00
03366a3540 merge 2021-01-02 20:02:16 +01:00
fadeaf1c43 fix 2021-01-02 20:00:15 +01:00
9296e1713b SES-124 Created ability cards 2021-01-02 19:53:03 +01:00
aeafc97679 Merge branch 'dev' into SES-120 2021-01-02 17:36:31 +01:00
e1c42cf07f SES-120 Fix typo 2021-01-02 17:35:30 +01:00
da96fea874 SES-120 Preform Migration 2021-01-02 17:35:16 +01:00
de3b7e3315 SES-120 Added scripts to populate armors and weapons 2021-01-02 17:34:45 +01:00
809362175d SES-120 Added necessary Jsons 2021-01-02 17:32:45 +01:00
dcbc5326dc Merge pull request 'SES-117' (#46) from SES-117 into dev
Reviewed-on: #46
2021-01-02 16:34:54 +01:00
c793c99811 Merge pull request 'SES-119 Added items tables' (#42) from SES-119 into dev
Reviewed-on: #42
2021-01-02 13:05:48 +01:00
ebbd30fc30 Merge branch 'dev' into SES-119 2021-01-02 13:03:33 +01:00
03bca2c11f SES-117 small changes 2021-01-02 00:43:52 +01:00
45288b2e3e SES-117 implemented basic player dashboard page 2021-01-02 00:40:54 +01:00
543bc41f3f Added base for ability cards 2021-01-01 22:14:01 +01:00
b35cca6091 Merge pull request 'SES-116 Create icons provider and show them on gm screen' (#45) from SES-116 into dev
Reviewed-on: #45
2020-12-30 12:19:55 +01:00
02d7304de3 prettier config 2020-12-30 12:17:31 +01:00
3c52e2d65d merge 2020-12-30 11:49:12 +01:00
329ac81ed2 SES-116 backend fix 2020-12-30 11:43:57 +01:00
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