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

563 commits

This branch
This branch
All branches
Author SHA1 Message Date
Absurdon
1b8cb10378
Merge pull request #181 from catjanin/new-gather-rule-url 
new gather page for rules
 2020-09-27 19:40:05 +02:00
Absurdon
1ad1970f36
Merge pull request #180 from catjanin/new-picking-pattern-092120 
new pick pattern
 2020-09-27 19:39:31 +02:00
AngelRionCervi
9dff80baac new gather page for rules 2020-09-21 20:42:26 +02:00
AngelRionCervi
0df578a0ea init 2020-09-21 17:22:06 +02: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
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
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
ArturPhilibin
3d3323fe13 Refactored approach to showing offline users (#131) 2019-02-14 21:21:29 +01: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
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
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
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