Brett Caswell
|
589d73fdbf
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-87u42u' into snyk-fixup
* parent-cblanc/snyk-fix-87u42u:
fix: package.json & package-lock.json to reduce vulnerabilities
# Conflicts:
# package-lock.json
# package.json
|
2020-08-24 00:55:30 -05:00 |
|
Brett Caswell
|
83a8582683
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-i7ttxq' into snyk-fixup
* parent-cblanc/snyk-fix-i7ttxq:
fix: package.json & package-lock.json to reduce vulnerabilities
# Conflicts:
# package-lock.json
# package.json
|
2020-08-24 00:52:56 -05:00 |
|
Brett Caswell
|
2f2c30de0a
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-domvsp' into snyk-fixup
* parent-cblanc/snyk-fix-domvsp:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:49:24 -05:00 |
|
Brett Caswell
|
b77232fe39
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-atk16s' into snyk-fixup
* parent-cblanc/snyk-fix-atk16s:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:48:54 -05:00 |
|
Brett Caswell
|
901d1a6d1a
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-ch1428' into snyk-fixup
* parent-cblanc/snyk-fix-ch1428:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:48:12 -05:00 |
|
Brett Caswell
|
d2cf48ca02
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-7auyfo' into snyk-fixup
* parent-cblanc/snyk-fix-7auyfo:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:47:23 -05:00 |
|
Brett Caswell
|
92d41891b6
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-2ltn4q' into snyk-fixup
* parent-cblanc/snyk-fix-2ltn4q:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:46:40 -05:00 |
|
Brett Caswell
|
d3a11275dd
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-kpxy08' into snyk-fixup
* parent-cblanc/snyk-fix-kpxy08:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:45:19 -05:00 |
|
Brett Caswell
|
35ad5b053a
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-vhiy92' into snyk-fixup
* parent-cblanc/snyk-fix-vhiy92:
fix: package.json to reduce vulnerabilities
|
2020-08-24 00:44:25 -05:00 |
|
Brett Caswell
|
e3f7d7d6e6
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-q14rdt' into snyk-fixup
* parent-cblanc/snyk-fix-q14rdt:
fix: package.json to reduce vulnerabilities
|
2020-08-24 00:44:06 -05:00 |
|
Brett Caswell
|
039d476f62
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-ilzyis' into snyk-fixup
* parent-cblanc/snyk-fix-ilzyis:
fix: package.json to reduce vulnerabilities
|
2020-08-24 00:43:57 -05:00 |
|
Brett Caswell
|
2240130bc1
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-otpy9p' into snyk-fixup
* parent-cblanc/snyk-fix-otpy9p:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:43:45 -05:00 |
|
Brett Caswell
|
f556977df2
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-tmx4k2' into snyk-fixup
* parent-cblanc/snyk-fix-tmx4k2:
fix: package.json to reduce vulnerabilities
# Conflicts:
# package.json
|
2020-08-24 00:42:54 -05:00 |
|
Brett Caswell
|
1f189617e3
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-510b69c7' into snyk-fixup
* parent-cblanc/snyk-fix-510b69c7:
fix: package.json to reduce vulnerabilities
|
2020-08-24 00:39:48 -05:00 |
|
Brett Caswell
|
7199096815
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-e60d8efe' into snyk-fixup
* parent-cblanc/snyk-fix-e60d8efe:
fix: package.json to reduce vulnerabilities
|
2020-08-24 00:39:38 -05:00 |
|
Brett Caswell
|
575ada9531
|
Merge remote-tracking branch 'parent-cblanc/snyk-fix-8fc2f3db' into snky-fixup
* parent-cblanc/snyk-fix-8fc2f3db:
fix: package.json to reduce vulnerabilities
|
2020-08-24 00:36:34 -05:00 |
|
Absurdon
|
e2dc987d6d
|
Merge pull request #171 from AngelRionCervi/changing-picking-pattern-again-and-again-and-again
changing pick order
|
2020-08-11 07:33:56 +02:00 |
|
AngelRionCervi
|
6549e49363
|
again
|
2020-08-11 04:40:48 +02:00 |
|
Absurdon
|
5844f30210
|
Merge pull request #170 from AngelRionCervi/fix-disconnect-user
Fix disconnect user
|
2020-08-10 18:01:57 +02:00 |
|
Absurdon
|
be40a45c7e
|
Merge pull request #169 from AngelRionCervi/afk-timer-fix
can't kick when election or selection is started
|
2020-08-10 18:00:52 +02:00 |
|
AngelRionCervi
|
e79bdec70d
|
added backend check
|
2020-08-10 17:00:05 +02:00 |
|
AngelRionCervi
|
c6409f330d
|
probable fix for disconnect user admin button
|
2020-08-10 16:15:43 +02:00 |
|
AngelRionCervi
|
fb39108c53
|
can't kick when election or selection is started
|
2020-08-04 16:15:01 +02:00 |
|
Absurdon
|
3a2abd76c9
|
Merge pull request #167 from AngelRionCervi/remove-gatherer-timeout
kick after delay when afk
|
2020-07-28 19:08:51 +02:00 |
|
AngelRionCervi
|
b67d54cb3e
|
kick after delay when afk
|
2020-07-21 20:30:01 +02:00 |
|
Christopher Blanchard
|
7dec7b84be
|
Merge pull request #163 from cblanc/snyk-fix-8c592a224173e8bab84efcee8732d276
[Snyk] Security upgrade lodash from 4.17.11 to 4.17.16
|
2020-07-13 10:42:26 +02:00 |
|
snyk-bot
|
29da6ddc4f
|
fix: package.json & package-lock.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
|
2020-07-10 03:25:25 +00:00 |
|
Absurdon
|
7714d9d27b
|
Merge pull request #159 from AngelRionCervi/master
golden's invite idea
|
2020-04-15 22:11:36 +02:00 |
|
AngelRionCervi
|
cabfbbc2ea
|
best commit ever git add .
|
2020-04-15 22:05:59 +02:00 |
|
AngelRionCervi
|
57be4bd141
|
golden's invite idea
|
2020-04-11 19:03:08 +02:00 |
|
Absurdon
|
a9917096c9
|
Merge pull request #156 from ArturPhilibin/bugfix/lebra_leave_join_spam_crash
Fixes a bug where users spamming join and rejoin can sometimes cause …
|
2020-02-13 21:08:02 +01:00 |
|
ArturPhilibin
|
f18718a686
|
Merge branch 'master' into bugfix/lebra_leave_join_spam_crash
|
2020-02-13 19:00:26 +00:00 |
|
Absurdon
|
8bc3bac6b9
|
Merge pull request #157 from ArturPhilibin/bugfix/wrong_idle_status_on_reconnect
Fixed an issue where in some scenarios users coming back online would…
|
2020-02-13 08:33:28 +01:00 |
|
ArturPhilibin
|
0c0dad087f
|
Fixed an issue where in some scenarios users coming back online wouldn't be counted, incorrectly marking the user as still being offline.
Also changed last seen status to show hours when offline time exceeeds 60 minutes
|
2020-02-12 00:02:22 +00:00 |
|
ArturPhilibin
|
c2f25eece7
|
Fixes a bug where users spamming join and rejoin can sometimes cause the UI to request leaving a gather the user is no longer a member of resulting in a crash due to null dereference.
See https://www.ensl.org/bans/879
|
2020-02-12 00:01:20 +00:00 |
|
Absurdon
|
8ce1306b05
|
Update default server data to avoid Errors
|
2019-11-07 08:44:59 +01:00 |
|
Absurdon
|
7303c62e32
|
Merge pull request #145 from AngelRionCervi/master
changed color of inactive picking bars
|
2019-06-24 10:17:08 +02:00 |
|
AngelRionCervi
|
fc6910d3f6
|
changed color of inactive picking bars
|
2019-06-23 12:28:54 +02:00 |
|
Absurdon
|
9af3466bc9
|
Merge pull request #144 from AngelRionCervi/master
replaced ts with dc
|
2019-06-21 15:42:31 +02:00 |
|
AngelRionCervi
|
7402dbcdd0
|
replaced all teamspeak with all discord
|
2019-06-18 23:31:16 +02:00 |
|
AngelRionCervi
|
d8300cbbfa
|
gerge branch 'master' of https://github.com/cblanc/sws_gathers
|
2019-06-17 19:51:27 +02:00 |
|
AngelRionCervi
|
d9540a460e
|
Added graphic to show the picking pattern (#143)
* renamed pickingPattern -> getPickingPattern
|
2019-06-10 10:07:21 +02:00 |
|
AngelRionCervi
|
669235846a
|
fixed conflicts
|
2019-06-10 10:02:50 +02:00 |
|
AngelRionCervi
|
a9e8d0848a
|
renamed pickingPattern -> getPickingPattern
|
2019-06-10 09:50:43 +02:00 |
|
AngelRionCervi
|
3c253a7c4b
|
Added graphic element to show the picking pattern (#142)
* added picking pattern
* removed all changes to helpers
|
2019-06-10 08:55:46 +02:00 |
|
AngelRionCervi
|
e50025de6d
|
removed all changes to helpers
|
2019-06-09 22:30:28 +02:00 |
|
AngelRionCervi
|
eb1c4e7c6d
|
added picking pattern
|
2019-06-09 16:14:19 +02:00 |
|
AngelRionCervi
|
4fb3d7e22d
|
disabled prog mod gather (#141)
|
2019-06-06 20:35:31 +02:00 |
|
AngelRionCervi
|
0c40591118
|
disabled prog mod gather
|
2019-06-04 18:58:08 +02:00 |
|
ArturPhilibin
|
e7e93121c6
|
Changed picking system back to 1-2-2-... eventually theyll realise theres no such thing as balanced teams... until then :) (#140)
Also removed empty socket.on('disconnect' callback
|
2019-05-28 22:45:03 +02:00 |
|