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

b6204e81e7 pagination and sort fix dev Łukasz Góreczny 2021-01-25 18:38:50 +0100
8ff2711363 fix bugs Łukasz Góreczny 2021-01-25 11:50:18 +0100
55a77aec8c Merge pull request 'SES-160 shop on gm and player screen' (#85) from SES-160 into dev Natalia Gawron 2021-01-23 21:50:01 +0100
5bd30e36f7 merge #85 SES-160 Łukasz Góreczny 2021-01-23 21:39:51 +0100
1ee65ef764 Merge pull request 'SES-156 create character from template' (#86) from SES-156 into dev Łukasz Góreczny 2021-01-23 21:34:41 +0100
4f94e86a7c SES-156 create character from template #86 Natalia Gawron 2021-01-23 20:39:42 +0100
123d1673b6 SES-160 log fix Łukasz Góreczny 2021-01-23 19:53:19 +0100
9d36c16600 SES-160 function to buy items Łukasz Góreczny 2021-01-23 19:36:24 +0100
4ede197d83 SES-156 WIP - step 2 - creating character Natalia Gawron 2021-01-22 22:09:41 +0100
706b2aa0fa SES-156 displaying template list, created basic UI, fixed backend service Natalia Gawron 2021-01-22 21:27:37 +0100
0a5b7a06f4 SES-160 game-master page Łukasz Góreczny 2021-01-22 21:15:19 +0100
9c41f51820 SES-156 added routing for creating character Natalia Gawron 2021-01-22 19:46:09 +0100
ba91bea4ea Merge branch 'dev' into SES-160 Łukasz Góreczny 2021-01-22 08:43:23 +0100
844137b551 fix typo Łukasz Góreczny 2021-01-22 08:42:52 +0100
18aebc4733 Merge pull request 'SES-164 Ujednolicenie Api response' (#82) from SES-164 into dev Łukasz Góreczny 2021-01-22 08:40:24 +0100
92b8366cef frontend fix #82 Łukasz Góreczny 2021-01-22 08:39:55 +0100
bbf28330e6 Create shopkeeper endpoint Łukasz Góreczny 2021-01-22 08:37:31 +0100
e048fe71a3 merge Łukasz Góreczny 2021-01-22 08:01:35 +0100
3f164b7e17 extra methods Łukasz Góreczny 2021-01-22 08:00:03 +0100
fc57fcbaba Merge pull request 'SES-165 players tables' (#84) from SES-165 into dev Łukasz Góreczny 2021-01-22 07:46:29 +0100
d43cac8129 resolved conflicts with dev #84 Natalia Gawron 2021-01-21 21:13:17 +0100
98079872ca SES-165 updated css for mobile Natalia Gawron 2021-01-21 21:06:37 +0100
c31075e54f SES-165 updated css Natalia Gawron 2021-01-21 20:50:29 +0100
44e6fd20b9 SES-165 added other equipment table connected with backend Natalia Gawron 2021-01-21 19:47:37 +0100
47f5132f14 SES-165 added armors table connected with backend Natalia Gawron 2021-01-21 18:43:39 +0100
b0aaea1474 controller update Łukasz Góreczny 2021-01-21 18:29:41 +0100
0e0079d973 Merge branch 'dev' into SES-160 Łukasz Góreczny 2021-01-21 18:23:53 +0100
32d645ea19 Merge pull request 'SES-154 Endpoint zmiany statusu sklepikarza' (#80) from SES-154 into dev Łukasz Góreczny 2021-01-21 18:22:17 +0100
ef7678fa69 merge #80 Łukasz Góreczny 2021-01-21 18:21:59 +0100
20dec1e4eb get all shopkeepers Łukasz Góreczny 2021-01-21 18:19:24 +0100
cac19da882 Merge pull request 'SES-158 Added function to send message to player' (#83) from SES-158 into dev Natalia Gawron 2021-01-21 17:51:33 +0100
8a7426cda5 Merge branch 'dev' into SES-158 #83 Natalia Gawron 2021-01-21 17:51:04 +0100
f9c41061e1 Merge pull request 'SES-153 Endpoint tworzący sklepikarza' (#81) from SES-153 into dev Łukasz Góreczny 2021-01-21 17:36:29 +0100
60895fd395 merge Łukasz Góreczny 2021-01-21 13:08:57 +0100
d5d9247edd added snackbar Łukasz Góreczny 2021-01-21 13:06:30 +0100
3a8090dab7 SES-164 Change bad references Karol Górzyński 2021-01-20 21:08:18 +0100
ee05b0d381 SES-164 Add new constructors and change succesResponse Karol Górzyński 2021-01-20 21:06:28 +0100
96ff8ae45f SES-165 created weapon teble for player, connected with backend Natalia Gawron 2021-01-20 20:57:59 +0100
42c786b1d0 SES-153 Add endpoint to create new Shopkeeper with items #81 Karol Górzyński 2021-01-20 20:54:39 +0100
99f177887f SES-153 Add new service, to create new shopkeeper with items Karol Górzyński 2021-01-20 20:54:19 +0100
69e23bf187 SES-153 Added Profile Karol Górzyński 2021-01-20 20:53:54 +0100
93a6631cc3 SES-153 Change and add new ViewModels Karol Górzyński 2021-01-20 20:53:34 +0100
f7dc48b008 SES-154 Add Reqired fields in EquiplmentController Karol Górzyński 2021-01-20 19:57:41 +0100
0b29aca44d SES-154 Add Endpoint to change shopkeeper status Karol Górzyński 2021-01-20 19:57:20 +0100
dde7039ad4 SES-154 Add Service that changes shopkeeper status Karol Górzyński 2021-01-20 19:56:51 +0100
c3dda1de44 SES-154 Fix seed beacuse multiple shopkeepers cannot be active at the same time Karol Górzyński 2021-01-20 19:33:46 +0100
3466b54785 Merge pull request 'SES-152 Endpoint zwracający sklepikarzy' (#79) from SES-152 into dev Łukasz Góreczny 2021-01-20 19:26:09 +0100
afe8b5e184 Merge branch 'SES-152' of git.wmi.amu.edu.pl:s426135/session-companion into SES-152 #79 Karol Górzyński 2021-01-20 19:14:50 +0100
22069cae7d SES-152 Apply feedback Karol Górzyński 2021-01-20 19:14:42 +0100
d572db69ca Merge branch 'dev' into SES-152 Karol Górzyński 2021-01-20 19:05:59 +0100
dcf17cf1de SES-152 Add Endpoint to get shopkeepers Karol Górzyński 2021-01-20 19:04:46 +0100
39fbd6c3bf SES-152 Add Interfaces (fix typo) Karol Górzyński 2021-01-20 18:55:11 +0100
b31cf9c703 SES-152 Add profiles and services Karol Górzyński 2021-01-20 18:54:56 +0100
3e1f7cd637 SES-152 Add Basic ViewModels for sshopkeepers Karol Górzyński 2021-01-20 18:54:11 +0100
561db899da SES-152 Add migration for Shopkeepers Karol Górzyński 2021-01-20 18:53:40 +0100
92fbe801b0 SES-152 Add Seed methods for Shopkeepers Karol Górzyński 2021-01-20 18:53:20 +0100
8fe7584682 SES-152 Add Repositories for Shopkeepers Karol Górzyński 2021-01-20 18:52:53 +0100
3fcc2d77b0 SES-152 Add Tables for shopkeepers Karol Górzyński 2021-01-20 18:52:02 +0100
d0cddafbac Merge pull request 'SES-159' (#78) from SES-159 into dev Natalia Gawron 2021-01-20 17:53:54 +0100
b2436c7dc9 error on move fix #78 Łukasz Góreczny 2021-01-20 17:48:45 +0100
905c26d873 working dialog on gm screen Łukasz Góreczny 2021-01-20 14:37:55 +0100
226dd666f5 SES-159 review fixes Łukasz Góreczny 2021-01-20 10:58:55 +0100
f3cfe2a326 SES-159 turn tracker final Łukasz Góreczny 2021-01-19 13:50:11 +0100
0d696c5bcd SES-159 turn tracker base Łukasz Góreczny 2021-01-19 11:49:20 +0100
5259a2ec57 Merge pull request 'SES-147 throw dialogs - player' (#77) from SES-147 into dev Łukasz Góreczny 2021-01-16 21:57:58 +0100
c9b2f15521 Merge branch 'dev' into SES-147 #77 Natalia Gawron 2021-01-16 21:56:15 +0100
0d0e03218d Merge pull request 'SES-151 Added shopkeepers table' (#76) from SES-151 into dev Natalia Gawron 2021-01-16 21:55:31 +0100
686e1b374a resolved conflicts Natalia Gawron 2021-01-16 21:53:41 +0100
a16f03a720 SES-147 displaying score whith other information Natalia Gawron 2021-01-16 21:49:22 +0100
0d69bbfe75 SES-151 Added shopkeepers table #76 Łukasz Góreczny 2021-01-16 20:33:34 +0100
5949512a38 SES-147 fixed css for mobile Natalia Gawron 2021-01-16 20:03:37 +0100
f3c1edbc2c Merge pull request 'SES-146 Added spells dialog' (#75) from SES-146 into dev Natalia Gawron 2021-01-16 19:33:21 +0100
e199b01f50 merge #75 Łukasz Góreczny 2021-01-16 19:32:29 +0100
a7ac3e65f2 Merge pull request 'SES-149 Added sevice and monster table' (#74) from SES-149 into dev Natalia Gawron 2021-01-16 19:24:44 +0100
35cbec16f7 SES-146 Added spells dialog Łukasz Góreczny 2021-01-15 23:24:50 +0100
b740fdc3b4 SES-147 display dialog for ST and other skills also Natalia Gawron 2021-01-15 22:55:19 +0100
bf58d05503 SES-147 modified UI dialog throw Natalia Gawron 2021-01-15 20:32:12 +0100
b71fcaa385 SES-149 Added sevice and monster table #74 Łukasz Góreczny 2021-01-15 20:30:41 +0100
f99437e3ab Merge pull request 'SES-157 Create characters from templates' (#73) from SES-157 into dev Łukasz Góreczny 2021-01-15 18:58:20 +0100
d3f9d79af1 Merge branch 'dev' of git.wmi.amu.edu.pl:s426135/session-companion into SES-157 #73 Karol Górzyński 2021-01-15 18:15:16 +0100
2005670077 Merge pull request 'SES-148 Endpointy dla Armor i Weapon' (#71) from SES-148 into dev Łukasz Góreczny 2021-01-14 16:45:04 +0100
46f2e3d158 Merge pull request 'SES-144 Seed tabeli przeciwników' (#72) from SES-144 into dev Łukasz Góreczny 2021-01-14 16:44:25 +0100
d21f9ecc4e Merge branch 'SES-148' of git.wmi.amu.edu.pl:s426135/session-companion into SES-148 #71 Karol Górzyński 2021-01-13 21:50:23 +0100
d26d9278a3 SES-148 Implement feedback Karol Górzyński 2021-01-13 21:50:21 +0100
12ecf5e935 SES-157 Add endpoint to create character from templates Karol Górzyński 2021-01-13 21:41:12 +0100
42eeb72f1a Update 'SessionCompanion/SessionCompanion/Controllers/EquipmentController.cs' Karol Górzyński 2021-01-13 21:17:24 +0100
e6dc7deeb9 SES-144 Preform migration #72 Karol Górzyński 2021-01-13 21:14:43 +0100
151d63fc24 SES-144 Add seed methods for monster seeding Karol Górzyński 2021-01-13 21:14:13 +0100
100d8a6806 SES-144 Add json Karol Górzyński 2021-01-13 21:13:42 +0100
ad92ad468b SES-148 CharacterWeaponViewModel doesnt need valid ID anymore Karol Górzyński 2021-01-13 20:24:10 +0100
71f01a167c SES-148 Add changing weapoin mechanic Karol Górzyński 2021-01-13 19:29:32 +0100
3ca90663b2 SES-148 Add Endpoint to add new weapon to character Karol Górzyński 2021-01-13 17:37:25 +0100
8a7c50b307 SES-148 Change endpoint location Karol Górzyński 2021-01-13 17:29:03 +0100
3facffb771 SES-148 resolve conflicts Karol Górzyński 2021-01-13 17:27:57 +0100
108dc89fd7 SES-148 finished character armor Karol Górzyński 2021-01-13 17:10:41 +0100
09863e9b8e SES-148 Added reference Łukasz Góreczny 2021-01-13 09:37:20 +0100
80873d2dfc Merge pull request 'SES-150 fix bug that you can log as same user multiple times' (#66) from SES-150 into dev Karol Górzyński 2021-01-13 09:30:32 +0100
d146ea3b78 Merge branch 'dev' into SES-150 #66 Karol Górzyński 2021-01-13 09:30:06 +0100
7d790cfdc8 Merge pull request 'SES-142 Added endpoints for character equipment' (#65) from SES-142 into dev Karol Górzyński 2021-01-13 09:29:47 +0100
deab61d1f2 Merge branch 'dev' into SES-142 #65 Karol Górzyński 2021-01-13 09:29:27 +0100