Commit graph

628 commits

Author SHA1 Message Date
Brett Caswell
4825cbf510 Merge remote-tracking branch 'parent-cblanc/dependabot/npm_and_yarn/lodash-4.17.19' into snyk-fixup
* parent-cblanc/dependabot/npm_and_yarn/lodash-4.17.19:
  Bump lodash from 4.17.16 to 4.17.19

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:24:40 -05:00
Brett Caswell
3633d066ff Merge remote-tracking branch 'parent-cblanc/snyk-fix-794739e93ca265ea3d7f45b63934f550' into snyk-fixup
* parent-cblanc/snyk-fix-794739e93ca265ea3d7f45b63934f550:
  fix: package.json, package-lock.json & .snyk to reduce vulnerabilities
  fix: package.json, package-lock.json & .snyk to reduce vulnerabilities
  fix: package.json, package-lock.json & .snyk to reduce vulnerabilities

# Conflicts:
#	.snyk
#	package-lock.json
#	package.json
2020-08-24 01:23:29 -05:00
Brett Caswell
2cd16fb50e Merge remote-tracking branch 'parent-cblanc/snyk-fix-28b961f8206cab11afe374f674305e06' into snyk-fixup
* parent-cblanc/snyk-fix-28b961f8206cab11afe374f674305e06:
  fix: package.json & package-lock.json to reduce vulnerabilities
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:21:53 -05:00
Brett Caswell
4481567526 Merge remote-tracking branch 'parent-cblanc/snyk-fix-43e620bb59ec3fa35f2e93c9ddb0ebf5' into snyk-fixup
* parent-cblanc/snyk-fix-43e620bb59ec3fa35f2e93c9ddb0ebf5:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:20:54 -05:00
Brett Caswell
774807e762 Merge remote-tracking branch 'parent-cblanc/snyk-fix-db73b282c019961c5cdeb5ea9096f903' into snyk-fixup
* parent-cblanc/snyk-fix-db73b282c019961c5cdeb5ea9096f903:
  fix: package.json & package-lock.json to reduce vulnerabilities
2020-08-24 01:18:42 -05:00
Brett Caswell
376fbf96dc Merge remote-tracking branch 'parent-cblanc/snyk-fix-9715381c80c3d45ce55a4ffeb5f0ec86' into snyk-fixup
* parent-cblanc/snyk-fix-9715381c80c3d45ce55a4ffeb5f0ec86:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:17:45 -05:00
Brett Caswell
468a652ca2 Merge remote-tracking branch 'parent-cblanc/snyk-fix-4cc2e86fd0ebd494a659b37ac268fc99' into snyk-fixup
* parent-cblanc/snyk-fix-4cc2e86fd0ebd494a659b37ac268fc99:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:16:33 -05:00
Brett Caswell
3e0d00eef0 Merge remote-tracking branch 'parent-cblanc/snyk-fix-a3399170c88de66e58d813564c8f5ab4' into snyk-fixup
* parent-cblanc/snyk-fix-a3399170c88de66e58d813564c8f5ab4:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:15:36 -05:00
Brett Caswell
d09f7f9610 Merge remote-tracking branch 'parent-cblanc/snyk-fix-fea34438536bc31bab03e814ad41de0a' into snyk-fixup
* parent-cblanc/snyk-fix-fea34438536bc31bab03e814ad41de0a:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:13:36 -05:00
Brett Caswell
0ded365f5f Merge remote-tracking branch 'parent-cblanc/snyk-fix-e71f02e2f9c9b5f8cb6bbc48d8140cec' into snyk-fixup
* parent-cblanc/snyk-fix-e71f02e2f9c9b5f8cb6bbc48d8140cec:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:11:42 -05:00
Brett Caswell
f61b44c865 Merge remote-tracking branch 'parent-cblanc/snyk-fix-8117a99069343347ed545a2481362a51' into snyk-fixup
* parent-cblanc/snyk-fix-8117a99069343347ed545a2481362a51:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:10:43 -05:00
Brett Caswell
e00c88af7b Merge remote-tracking branch 'parent-cblanc/snyk-fix-9868b5023fccf1b1fd58a9f87472fa7a' into snyk-fixup
* parent-cblanc/snyk-fix-9868b5023fccf1b1fd58a9f87472fa7a:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:09:32 -05:00
Brett Caswell
056b9ee7d3 Merge remote-tracking branch 'parent-cblanc/snyk-fix-91876af1f3d60f63dddf9330f2fe1387' into snyk-fixup
* parent-cblanc/snyk-fix-91876af1f3d60f63dddf9330f2fe1387:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:07:33 -05:00
Brett Caswell
5ae6b4cb11 Merge remote-tracking branch 'parent-cblanc/snyk-fix-ab91c8bc377a3ac3b9e7f4f5144e47e4' into snyk-fixup
* parent-cblanc/snyk-fix-ab91c8bc377a3ac3b9e7f4f5144e47e4:
  fix: .snyk, package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
2020-08-24 01:03:13 -05:00
Brett Caswell
e59826e366 Merge remote-tracking branch 'parent-cblanc/snyk-fix-tych60' into snyk-fixup
* parent-cblanc/snyk-fix-tych60:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 01:00:33 -05:00
Brett Caswell
a53c2baf7b Merge remote-tracking branch 'parent-cblanc/snyk-fix-2r55vp' into snyk-fixup
* parent-cblanc/snyk-fix-2r55vp:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 00:57:37 -05:00
Brett Caswell
61d70b9326 Merge remote-tracking branch 'parent-cblanc/snyk-fix-9uw8hg' into snyk-fixup
* parent-cblanc/snyk-fix-9uw8hg:
  fix: package.json & package-lock.json to reduce vulnerabilities

# Conflicts:
#	package-lock.json
#	package.json
2020-08-24 00:56:43 -05:00
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
dependabot[bot]
b2cff591f3
Bump lodash from 4.17.16 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.16 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.16...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-15 22:17:45 +00: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
snyk-bot
e4d6d9b30d fix: package.json, package-lock.json & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JQUERY-567880


The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
2020-05-01 05:26:51 +02:00
snyk-bot
5409e89b88 fix: package.json, package-lock.json & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JQUERY-567880


The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
2020-05-01 05:26:49 +02:00
snyk-bot
6aaa6b9a16 fix: package.json, package-lock.json & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JQUERY-567880


The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
2020-05-01 05:26:48 +02:00
snyk-bot
f7db2b586c fix: package.json & package-lock.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HANDLEBARS-567742
2020-04-29 05:25:53 +02:00
snyk-bot
02dafdd2b5 fix: package.json & package-lock.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HANDLEBARS-567742
2020-04-29 05:25:52 +02:00