ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-29 15:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
622 commits 58 branches 3 tags 8.4 MiB
Commit graph

622 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snyk-bot
ef3eb187d5 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-KINDOF-537849
 2020-01-22 03:26:36 +00:00
snyk-bot
5901ec61d4 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:braces:20180219
- https://snyk.io/vuln/npm:clean-css:20180306
 2019-12-17 03:26:53 +00:00
snyk-bot
468e93ed4a fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HANDLEBARS-534988
 2019-11-21 03:25:33 +00:00
snyk-bot
5fc20c6990 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HANDLEBARS-534478
 2019-11-16 03:27:03 +00:00
Absurdon
8ce1306b05 Update default server data to avoid Errors 2019-11-07 08:44:59 +01:00
snyk-bot
d504359b97 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MONGODB-473855
 2019-10-19 03:25:37 +00:00
snyk-bot
d79e416219 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MONGOOSE-472486
 2019-10-17 03:26:59 +00:00
snyk-bot
2f6acf9944 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HTTPSPROXYAGENT-469131
 2019-10-11 03:25:32 +00:00
snyk-bot
2d03b39a2f fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HANDLEBARS-469063
 2019-09-26 03:25:31 +00:00
snyk-test
9fdd9dba24 fix: .snyk, package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-450202
 2019-07-04 03:27:22 +00: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
snyk-bot
f0525a75b2 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HANDLEBARS-174183
 2019-04-15 03:26:01 +00:00
snyk-bot
0f7208989d fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JQUERY-174006
 2019-04-12 03:25:32 +00:00
AngelRionCervi
a7c9072048 reworked and fix minimized drawer (#137) 
* added icons imgs for minimized drawer

* added 1 css class for imgs in minimized drawer

* rework minimized drawer a bit

* remove some console.log i forgot about

* modified sources of icons for when the drawer is minimized and so removed the function to get them

* added the icons path to the json representing the gather instance

i dont even know what im doing

* setup icons path

* linked icons from gather_pool.js to the front end ..?

i'm kinda lost here
 2019-03-25 08:42:15 +01:00
snyk-bot
15ccaf397a fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-BOOTSTRAP-173700
 2019-02-19 03:28:33 +00:00
HystesGitHub
99a40bfc40 fixing join server link #2 (#132) 
* Update gather.js

Didn't test in the app, but this should make you join the server and not only the game :).

* Update gather.js
 2019-02-14 21:22:33 +01:00
ArturPhilibin
a6a945281a New picking system (#133) 
* Changed picking system to 1-1-1-2-1-1-2-1

* removed code committed by accident from customizable picking system branch

* changes picking order logic to handle cases where teams are larger than 6v6

* add a safety check on the picking logic to prevent a team ever growing beyond the team size limit regardless of the picking order defined

* add a safety check on the picking logic to prevent a team ever growing beyond the team size limit regardless of the picking order defined
 2019-02-14 21:22:03 +01:00
snyk-bot
b2911dd5f1 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HANDLEBARS-173692
 2019-02-14 20:21:49 +00:00
ArturPhilibin
3d3323fe13 Refactored approach to showing offline users (#131) 2019-02-14 21:21:29 +01:00
snyk-bot
00d97a85f8 fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:bootstrap:20180529
 2019-02-14 03:25:22 +00:00
HystesGitHub
8fe13a0629 Update gather.js (#129) 
Didn't test in the app, but this should make you join the server and not only the game :).
 2019-01-14 07:25:55 +01:00
snyk-bot
bda6a2890a fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:bootstrap:20180529
 2019-01-12 03:44:18 +00:00
snyk-bot
fe48831316 fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-BOOTSTRAP-72889
- https://snyk.io/vuln/SNYK-JS-BOOTSTRAP-72890
 2019-01-10 17:15:23 +00:00
ArturPhilibin
4553d8aee0 Styled gatherer names with italics if they are no longer on the gather (#127) 
page.
Displays a somewhat inaccurate (but in the afk gatherers favour) idle
timer in the gatherer info panel.
 2019-01-10 18:15:14 +01:00
snyk-bot
e4440b9195 fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:extend:20180424
 2019-01-03 07:55:08 +00:00
ArturPhilibin
39c64072c0 Removed all references on the FrontEnd to a global server list, its gone now, also made the FrontEnd gracefully handle archived gathers with no servers (#125) 2018-12-29 16:28:15 +01:00
ArturPhilibin
4b2d67f524 Adding progmod gathers (#124) 
* basic implementation of filtered servers and progmod gathers, need to refactor the changes ive done to servers, want to add them to the gather object instead of that ugly copy on the frontend

* refactored server list by attaching them to the gather object allowing them to be filtered by gather type rather than a global list

* fixed issue where page would crash if there were fewer than 2 server options
 2018-12-29 14:43:05 +01:00
ArturPhilibin
23c96196f8 Changed gather kick method to log only the kicked user's id instead of their username, username not immediately available and too lazy to figure out where to find it (#122) 2018-12-15 15:44:44 +01:00
snyk-bot
8cfbb3886b fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MPATH-72672
 2018-12-14 04:35:10 +00:00
snyk-bot
a3b43ca766 fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:bootstrap:20160627
- https://snyk.io/vuln/npm:concat-stream:20160901
- https://snyk.io/vuln/npm:debug:20170905
- https://snyk.io/vuln/npm:extend:20180424
- https://snyk.io/vuln/npm:jquery:20150627
- https://snyk.io/vuln/npm:mime:20170907
- https://snyk.io/vuln/npm:ms:20170412
 2018-12-08 06:34:55 +00:00
Absurdon
efaa7ae94f Added logging for admin removal 2018-12-01 12:21:56 +01:00
Absurdon
2531d82221
Removing references to discordBot 2018-11-20 20:22:53 +01:00
Absurdon
ea0ae11af6 Disconnect socket on error so it doesn't spam with retries 2018-11-19 00:25:43 +01:00