session-companion

s426135/session-companion

Fork 0

Commit Graph

Select branches

Hide Pull Requests

SES-160

dev

master

test-jenkins

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#9

c59e4b3814 Merge pull request 'SES-120' (#47) from SES-120 into dev Łukasz Góreczny 2021-01-02 20:03:31 +0100
03366a3540 merge Łukasz Góreczny 2021-01-02 20:02:16 +0100
fadeaf1c43 fix Łukasz Góreczny 2021-01-02 20:00:15 +0100
9296e1713b SES-124 Created ability cards Łukasz Góreczny 2021-01-02 19:53:03 +0100
aeafc97679 Merge branch 'dev' into SES-120 #47 Karol Górzyński 2021-01-02 17:36:31 +0100
e1c42cf07f SES-120 Fix typo Karol Górzyński 2021-01-02 17:35:30 +0100
da96fea874 SES-120 Preform Migration Karol Górzyński 2021-01-02 17:35:16 +0100
de3b7e3315 SES-120 Added scripts to populate armors and weapons Karol Górzyński 2021-01-02 17:34:45 +0100
809362175d SES-120 Added necessary Jsons Karol Górzyński 2021-01-02 17:32:45 +0100
dcbc5326dc Merge pull request 'SES-117' (#46) from SES-117 into dev Łukasz Góreczny 2021-01-02 16:34:54 +0100
c793c99811 Merge pull request 'SES-119 Added items tables' (#42) from SES-119 into dev Karol Górzyński 2021-01-02 13:05:48 +0100
ebbd30fc30 Merge branch 'dev' into SES-119 #42 Karol Górzyński 2021-01-02 13:03:33 +0100
03bca2c11f SES-117 small changes #46 Natalia Gawron 2021-01-02 00:43:52 +0100
45288b2e3e SES-117 implemented basic player dashboard page Natalia Gawron 2021-01-02 00:40:54 +0100
543bc41f3f Added base for ability cards Łukasz Góreczny 2021-01-01 22:14:01 +0100
b35cca6091 Merge pull request 'SES-116 Create icons provider and show them on gm screen' (#45) from SES-116 into dev Natalia Gawron 2020-12-30 12:19:55 +0100
02d7304de3 prettier config #45 Łukasz Góreczny 2020-12-30 12:17:31 +0100
3c52e2d65d merge Łukasz Góreczny 2020-12-30 11:49:12 +0100
329ac81ed2 SES-116 backend fix Łukasz Góreczny 2020-12-30 11:43:57 +0100
a7aaacb2e5 SES-116 Update icons rmd and package json Łukasz Góreczny 2020-12-30 11:41:24 +0100
f75e20876b SES-116 Fix Icons on right panel Łukasz Góreczny 2020-12-30 11:38:58 +0100
85dc9920fa Merge pull request 'SES-115' (#44) from SES-115 into dev Łukasz Góreczny 2020-12-29 15:31:51 +0100
18d1b75c4a connected with backend - select character #44 Natalia Gawron 2020-12-28 17:39:55 +0100
665ef65ec0 conneted with backend - get user characters list Natalia Gawron 2020-12-28 17:03:53 +0100
7b430e05cb SES-116 Database update and icons fix Łukasz Góreczny 2020-12-28 14:59:42 +0100
d61c3f620f added pointer class, updated mockup character list Natalia Gawron 2020-12-28 13:38:45 +0100
9477b7346b merge Łukasz Góreczny 2020-12-28 11:28:08 +0100
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 Natalia Gawron 2020-12-27 22:13:16 +0100
6dc97aa9c3 Merge branch 'dev' into SES-114 #40 Natalia Gawron 2020-12-27 22:12:48 +0100
2126eabe75 Merge pull request 'SES-123' (#41) from SES-123 into dev Natalia Gawron 2020-12-27 22:05:59 +0100
2a5e04bbd1 SES-116 Get lsit of logged characters Łukasz Góreczny 2020-12-27 21:17:19 +0100
fe5921fa57 SES-116 Small fix on backend Łukasz Góreczny 2020-12-27 21:17:00 +0100
4b0382a931 SES-121 Added spells tables Łukasz Góreczny 2020-12-27 20:08:19 +0100
89c25d4342 SES-119 Added items tables Łukasz Góreczny 2020-12-27 19:47:13 +0100
e17e3ace58 SES-123 Added reducers and miissed unsubscribe #41 Łukasz Góreczny 2020-12-27 17:55:28 +0100
b82393a62b SES-123 Lint errors fix Łukasz Góreczny 2020-12-27 16:33:02 +0100
607145f45f Icon module register Łukasz Góreczny 2020-12-27 16:25:12 +0100
b9c44c9120 SES-123 Icons module added Łukasz Góreczny 2020-12-27 16:25:00 +0100
004619d6dd SES-114 Adder Errors to register view and user can no longer register with two different passwords Łukasz Góreczny 2020-12-23 13:06:01 +0100
9826e57e7f Merge pull request 'added e2e test - zad.3 lab 9' (#39) from frontend-tests into dev Łukasz Góreczny 2020-12-21 20:39:22 +0100
d6da8436bc Merge branch 'dev' into frontend-tests #39 Natalia Gawron 2020-12-21 20:38:29 +0100
e47ba17121 added e2e test - zad.3 lab 9 Natalia Gawron 2020-12-21 20:36:32 +0100
e5196c3513 Tests added Łukasz Góreczny 2020-12-21 18:08:51 +0100
e1c0c66b1b Merge pull request 'SES-103' (#38) from SES-103 into dev Łukasz Góreczny 2020-12-21 17:00:10 +0100
1fc3e040e7 merge v2 #38 Łukasz Góreczny 2020-12-21 16:56:32 +0100
c1f520fbc5 merge Łukasz Góreczny 2020-12-21 16:56:14 +0100
f426f5029b Change to login to role Łukasz Góreczny 2020-12-21 16:54:22 +0100
b49bdae96a SES-103 WIP Natalia Gawron 2020-12-21 16:17:14 +0100
070cafed58 Merge pull request 'SES-105 list of logged charcters' (#36) from SES-105 into dev Łukasz Góreczny 2020-12-21 13:40:46 +0100
441e09a12f change login path #36 Łukasz Góreczny 2020-12-21 13:40:11 +0100
0de41a2ce8 Changed method to return characters Karol Górzyński 2020-12-21 13:30:59 +0100
8de1b8bb5a Merge branch 'dev' into SES-105 Karol Górzyński 2020-12-21 12:57:25 +0100
44fdbc9029 Merge pull request 'SES-101 Added Login to Signalr on GM' (#34) from SES-101 into dev Natalia Gawron 2020-12-21 11:25:16 +0100
9c4b438e9b Merge branch 'dev' into SES-101 #34 Łukasz Góreczny 2020-12-21 11:16:15 +0100
6350ad7239 Updating 105 Karol Górzyński 2020-12-20 16:34:37 +0100
2c302d7f09 remove error response from GetLoggedUsersCharacters Karol Górzyński 2020-12-20 16:30:15 +0100
23c19b9acb Merge pull request 'SES-112 Fixed bug with registering the same user multiple times' (#37) from SES-112 into dev Łukasz Góreczny 2020-12-20 16:02:46 +0100
d6db2b6b56 Fixed unnecessary call #37 Karol Górzyński 2020-12-20 15:59:42 +0100
10cd041d38 Fixed bug with registering the same user multiple times Karol Górzyński 2020-12-20 15:57:10 +0100
bf5604871d Add Controller that returns logged characters Karol Górzyński 2020-12-20 15:46:00 +0100
11af142a09 Added Service to show character basic properties Karol Górzyński 2020-12-20 15:45:29 +0100
e4ce736960 Merge pull request 'added basic mock select character component' (#35) from SES-100 into dev Łukasz Góreczny 2020-12-19 22:33:38 +0100
1698b66f43 added basic mock select character component #35 Gawron 2020-12-19 22:31:38 +0100
6145d9f594 SES-101 Added Login to Signalr on GM Łukasz Góreczny 2020-12-19 18:43:21 +0100
3d33b981fe Merge pull request 'SES-104 Character Data Seed' (#33) from SES-104 into dev Karol Górzyński 2020-12-18 21:25:30 +0100
956d7b2a32 Merge branch 'dev' into SES-104 #33 Karol Górzyński 2020-12-18 21:19:54 +0100
4ddb1a5194 Merge pull request 'SES-107 Added new method to return characters list' (#32) from SES-107 into dev Karol Górzyński 2020-12-18 21:19:13 +0100
910918d4c5 Merge branch 'dev' into SES-107 #32 Karol Górzyński 2020-12-18 21:19:05 +0100
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 Karol Górzyński 2020-12-18 21:17:21 +0100
6461af2757 SES-104 Character Data Seed Łukasz Góreczny 2020-12-18 12:00:36 +0100
b138651a8f SES-107 Added new method to return characters list Łukasz Góreczny 2020-12-18 11:18:48 +0100
eeb9c2ebe0 SES-106 Added new method in controller #31 Łukasz Góreczny 2020-12-18 10:52:48 +0100
f75e9d96f9 SES-106 changed SignalR static field to be able to share them in other classes Łukasz Góreczny 2020-12-18 10:52:37 +0100
c384b279cb Merge pull request 'Update CharacterController with Either, also small style fix in UserController' (#30) from SES-92 into dev Łukasz Góreczny 2020-12-16 21:49:35 +0100
474d01e901 Update CharacterController with Either, also small style fix in UserController #30 Karol Górzyński 2020-12-15 15:36:23 +0100
50236f8ea0 Merge pull request 'SES-88 Created User register connection' (#29) from SES-88 into master master Natalia Gawron 2020-12-13 19:41:33 +0100
2b4cd79484 SES-88 Created User register connection #29 Łukasz Góreczny 2020-12-13 19:27:28 +0100
79f6bede98 Merge pull request 'SES-84 Created User registration method' (#27) from SES-84 into master Łukasz Góreczny 2020-12-13 17:07:55 +0100
c9a4e7aa0d Merge branch 'master' into SES-84 #27 Łukasz Góreczny 2020-12-13 13:30:33 +0100
73f01e8e2c Merge pull request 'SES-89 Connected to backend for login' (#28) from SES-89 into master Natalia Gawron 2020-12-13 13:29:18 +0100
57759fb91e SES-89 type change #28 Łukasz Góreczny 2020-12-13 13:27:45 +0100
815bd676d1 SES-84 Change type to Either Łukasz Góreczny 2020-12-13 13:22:09 +0100
1412362b79 SES-89 Switched to subscribe Łukasz Góreczny 2020-12-13 13:05:08 +0100
6f8cf6dcb4 UserController.cs change Kosma 2020-12-13 12:45:50 +0100
b9928d6ce0 SES-89 Added api connection service and display error Łukasz Góreczny 2020-12-13 11:19:01 +0100
7b122e160e Merge pull request 'SES-90 Added Game Master component' (#26) from SES-90 into master Natalia Gawron 2020-12-12 19:39:36 +0100
479fd2114b SES-90 Confilcts resolve #26 Łukasz Góreczny 2020-12-12 19:24:18 +0100
fcfd8665c2 Merge pull request 'SES-86 added Sign Up Component' (#25) from SES-86 into master Łukasz Góreczny 2020-12-12 19:20:23 +0100
a4ed6faa05 SES-90 Added Game master component Łukasz Góreczny 2020-12-12 19:06:30 +0100
4ed509bd0a SES-86 added validator into sign in and sing up components, changed styles #25 Natalia Gawron 2020-12-12 18:51:08 +0100
0fd20fd2b1 SES-90 Styles changes Łukasz Góreczny 2020-12-12 11:16:25 +0100
530c49f1b7 SES-86 added Sign Up Component Natalia Gawron 2020-12-12 00:21:06 +0100
e6b632f8f6 Merge pull request 'SES-87 defined default style, created LoginUI component' (#24) from SES-87 into master Łukasz Góreczny 2020-12-11 22:08:22 +0100
e83bc3fa73 Merge branch 'master' into SES-87 #24 Natalia Gawron 2020-12-11 22:05:39 +0100
012c8828e1 SES-87 defined default style, created LoginUI component Natalia Gawron 2020-12-11 21:57:52 +0100
663b33e4a8 Merge pull request 'SES-81 Rozdzielenie back of front' (#23) from SES-81 into master Łukasz Góreczny 2020-12-11 20:16:13 +0100
fde1196069 Merge branch 'master' into SES-81 #23 Karol Górzyński 2020-12-11 19:20:39 +0100
cd1a0af239 Merge pull request 'SES-91 Utworzenie modelu zwrotek AP oraz zajmowanie się domyślnymi exceptionami' (#22) from SES-91 into master Karol Górzyński 2020-12-11 17:08:07 +0100
b0e0e5c5f5 Merge branch 'SES-91' of git.wmi.amu.edu.pl:s426135/session-companion into SES-91 #22 Łukasz Góreczny 2020-12-11 11:11:06 +0100
81aebe44de SES-91 Added documentation and extra method Łukasz Góreczny 2020-12-11 11:10:51 +0100