martyn/townsquare
1
0
Fork 0
mirror of https://github.com/bra1n/townsquare.git synced 2025-10-21 16:55:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
1162 commits 3 branches 36 tags 94 MiB
Commit graph

1162 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Steffen
af2587295d
2.15.2 2021-07-14 14:00:11 +02:00
Steffen
97121e81e7
changelog 2021-07-14 14:00:10 +02:00
Steffen
3d696c85de
fix negative nightOrder numbers causing a mess (fixes #193) 2021-07-14 14:00:10 +02:00
Steffen
ff217761ff
revert role modal tab when closing (fixes #194) 2021-07-14 14:00:10 +02:00
Steffen
30aa5cdf8a
show leaves on tokens with global reminders 2021-07-14 14:00:10 +02:00
Steffen
fe51d60839
added mobile web app capabilities 2021-07-14 14:00:10 +02:00
Steffen
282291e6ec
Merge pull request #198 from eddgabriel/develop 
Futureproofing
 2021-07-14 12:47:05 +02:00
eddgabriel
2a751b7fc2 Update CHANGELOG.md 2021-07-08 22:34:40 +01:00
eddgabriel
6fd7a0f0ee Futureproofing 
So that when the name changes in the script tool, we're ready :)
 2021-07-08 22:31:12 +01:00
Steffen
e694c24689
Merge pull request #196 from bra1n/develop 
v2.15.1
 2021-07-08 19:56:39 +02:00
Steffen
ef0ab81e3c 2.15.1 2021-07-08 19:55:52 +02:00
Steffen
dc4b2d5de8 npm audit 2021-07-08 19:55:50 +02:00
Steffen
358d5c156d
Merge pull request #195 from eddgabriel/develop 
Tick... Tick... Tick...
 2021-07-08 19:51:27 +02:00
eddgabriel
073494974e Tick... Tick... Tick... 2021-07-01 22:15:06 +01:00
Steffen
fe118444d3
Merge pull request #190 from bra1n/develop 
fix Mephit
 2021-06-20 23:39:46 +02:00
Steffen
24134324de
Merge pull request #189 from JulGvoz/develop 
Revert Mezepheles to Mephit
 2021-06-20 23:39:10 +02:00
Jul Gvoz
233d972e33 Revert Mezepheles to Mephit 2021-06-21 00:25:10 +03:00
Steffen
3795b3ee2b
Merge pull request #187 from bra1n/develop 
v2.15.0
 2021-06-19 20:20:16 +02:00
Steffen
b02b47cc2c
2.15.0 2021-06-19 20:19:02 +02:00
Steffen
ab2ceb0139
changelog 2021-06-19 20:18:48 +02:00
Steffen
fc9209d51f
Merge pull request #186 from eddgabriel/develop 
Llooks llike a llovelly new character!
 2021-06-17 23:42:32 +02:00
eddgabriel
b57c81aa13 Llooks llike a llovelly new character! 
Maybe it's Wellsh?
 2021-06-17 22:10:15 +01:00
Steffen
7d212cb689
Merge pull request #180 from bra1n/develop 
release Magician
 2021-06-08 22:55:50 +02:00
Steffen
a1e1b627db
Merge pull request #179 from eddgabriel/develop 
Abracadabra!
 2021-06-04 08:54:37 +02:00
eddgabriel
4f4031dcc4 Abracadabra! 2021-06-03 22:22:40 +01:00
Steffen
804b77546e
Merge pull request #178 from JulGvoz/develop 
Automatically clean icons (fixes #176)
 2021-06-01 20:20:52 +02:00
JulGvoz
bf2cec0ec5
Update CHANGELOG.md 2021-05-31 17:18:06 +03:00
Jul Gvoz
2e503eba7f Automatically clean icons (fixes #176) 2021-05-31 15:01:27 +03:00
Steffen
661aac9bcb
Merge pull request #177 from bra1n/dependabot/npm_and_yarn/ws-7.4.6 
Bump ws from 7.4.4 to 7.4.6
 2021-05-30 10:03:56 +02:00
dependabot[bot]
4d373d313f
Bump ws from 7.4.4 to 7.4.6 
Bumps [ws](https://github.com/websockets/ws) from 7.4.4 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.4...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-30 06:27:50 +00:00
Steffen
4d862a9bd2
Merge pull request #175 from bra1n/develop 
v2.14.0
 2021-05-25 19:54:11 +02:00
Steffen
26c5ec6741
2.14.0 2021-05-25 19:45:59 +02:00
Steffen
6b38a352ad
Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	CHANGELOG.md
 2021-05-25 19:41:34 +02:00
Steffen
1afec12478
farmer 2021-05-25 19:41:08 +02:00