martyn
/
townsquare
mirror of https://github.com/bra1n/townsquare.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
746 Commits 3 Branches 36 Tags 66 MiB
Commit Graph

746 Commits

Author SHA1 Message Date
Steffen 795ea1b6a5
Merge pull request #243 from bra1n/develop 
deployment
 2022-02-05 23:13:32 +01:00
Steffen 1c63ee6208
Merge pull request #242 from eddgabriel/develop 
Nightwatchman
 2022-02-05 23:07:21 +01:00
eddgabriel 2a0f025b0c
Merge branch 'bra1n:develop' into develop 2022-02-05 21:18:27 +00:00
eddgabriel 11e1e99a94 Nightwatchman 2022-02-05 21:15:55 +00:00
Steffen a9eb07ad14
script tool url fixed 2022-01-30 12:12:51 +01:00
Steffen 885414a5a1
Merge pull request #241 from bra1n/develop 
fixed local server (closes #240)
 2022-01-25 12:30:16 +01:00
Steffen 350d2a5a18
fixed local server (closes #240) 2022-01-25 12:25:48 +01:00
Steffen 64b7748943
Merge pull request #236 from bra1n/develop 
atheist
 2021-12-07 14:02:47 +01:00
Steffen 0ca33f0d53
Merge pull request #235 from eddgabriel/develop 
Atheist
 2021-12-07 14:02:18 +01:00
eddgabriel bf393bbc71 Update icons 2021-12-07 12:12:42 +00:00
eddgabriel a73d6ce73c Update roles.json 2021-12-07 10:17:17 +00:00
eddgabriel 31265aa4fd Atheist 2021-12-07 10:15:40 +00:00
Steffen b1a4aa5c65
Merge pull request #234 from bra1n/develop 
psychopath
 2021-11-24 18:20:47 +01:00
Steffen a3cb8570f6
Merge pull request #233 from eddgabriel/develop 
Psychopath
 2021-11-19 20:42:25 +01:00
eddgabriel 8649aa4eec Psychopath 2021-11-18 22:11:35 +00:00
Steffen 2caee21418
Merge pull request #231 from bra1n/develop 
fix jinx
 2021-11-05 22:36:47 +01:00
Steffen 9e6ff3e69e
fix jinx 2021-11-05 22:36:16 +01:00
Steffen 665fb4ab71
Merge pull request #230 from bra1n/develop 
Riot
 2021-11-05 21:51:20 +01:00
Steffen ffe69a8dcb
Merge pull request #229 from eddgabriel/develop 
Riot
 2021-11-05 21:51:02 +01:00
eddgabriel 6a3fdfa384 Riot 
Look at the number of those jinxes... Just look at 'em...
 2021-11-04 22:14:44 +00:00
Steffen b5531e4353
Merge pull request #228 from bra1n/develop 
engineer
 2021-10-22 21:06:23 +02:00
Steffen 83889b21dd
Merge pull request #227 from eddgabriel/develop 
Engineer
 2021-10-22 21:00:44 +02:00
eddgabriel c93b50df42 Engineer 2021-10-21 22:35:11 +01:00
Steffen 8a6da3d7ab
Update README.md 2021-10-19 10:46:15 +02:00
Steffen c5669845df
Merge pull request #225 from bra1n/develop 
alchemist
 2021-10-15 10:44:00 +02:00
Steffen 7ebf296cfc
Merge pull request #224 from eddgabriel/develop 
Alchemist!
 2021-10-15 10:38:09 +02:00
eddgabriel 772c94a6c6 Alchemist! 2021-10-14 13:36:43 +01:00
Steffen cb25e0a9b6
Merge pull request #222 from bra1n/develop 
release
 2021-09-28 14:03:30 +02:00
Steffen 45dfb124f7
Merge pull request #221 from eddgabriel/develop 
Puzzlemaster
 2021-09-28 14:03:07 +02:00
eddgabriel 401312ab09 Puzzlemaster 2021-09-28 11:43:10 +01:00
Steffen 13b52bc7f1
Merge pull request #217 from bra1n/develop 
Fearmonger
 2021-09-11 17:55:19 +02:00
Steffen c00b89824c
Merge pull request #216 from eddgabriel/develop 
Fearmonger
 2021-09-11 17:54:54 +02:00
eddgabriel 59c39773aa Update fearmonger.png 2021-09-11 15:40:39 +01:00
eddgabriel fa1feb3c0b Fearmonger 2021-09-10 00:07:12 +01:00
Steffen 1c5fa843ed
Merge pull request #215 from bra1n/develop 
Golem
 2021-08-31 20:09:15 +02:00
Steffen e1ba442af7
Merge pull request #214 from eddgabriel/develop 
Golem
 2021-08-31 20:08:42 +02:00
eddgabriel 5780c155d3 Merge branch 'develop' of https://github.com/eddgabriel/townsquare into develop 2021-08-31 10:22:47 +01:00
eddgabriel 9517a3e262 Golem 2021-08-31 10:20:33 +01:00
Steffen 18746ab642
npm audit 2021-08-19 20:54:55 +02:00
Steffen 3b4d26fb8b
Merge pull request #211 from bra1n/develop 
new role release
 2021-08-13 13:03:14 +02:00
Steffen 29357ecf54
Merge pull request #210 from eddgabriel/develop 
Al-Hadikhia
 2021-08-13 13:02:50 +02:00
eddgabriel f664bdf024 Update roles.json 2021-08-13 11:56:59 +01:00
eddgabriel 9fff5541bb Al-Hadikhia 2021-08-12 23:21:28 +01:00
Steffen 3a61252b61
Merge pull request #205 from bra1n/develop 
Noble
 2021-08-02 11:47:15 +02:00
Steffen 0199108e2f
Merge pull request #204 from eddgabriel/develop 
Noble
 2021-08-02 11:46:52 +02:00
eddgabriel a35c6f3c14 Noble 2021-08-02 10:28:59 +01:00
Steffen c399edc544
Merge pull request #203 from bra1n/develop 
huntsman/damsel
 2021-07-21 12:34:45 +02:00
Steffen 9bafcc2c61
Merge pull request #202 from eddgabriel/develop 
Huntsman/Damsel
 2021-07-21 12:34:13 +02:00
eddgabriel fb2e81c299 Huntsman/Damsel 2021-07-20 20:27:02 +01:00
Steffen 2824972d0a
Merge pull request #200 from bra1n/develop 
v2.15.2
 2021-07-14 14:02:29 +02:00