Skip to content

merge with development #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 16 commits into from
Aug 27, 2023
Merged

merge with development #988

merged 16 commits into from
Aug 27, 2023

Conversation

@proditis
Copy link
Collaborator

@proditis proditis commented Aug 27, 2023 •
edited
Loading

This PR does

  • Changes the command line player/mail parameters and logic
  • Fix a logic bug in component/Pf where we didnt clear the last instance firewall rules
  • Update stripe and yii version
  • Introduces team_allowed instances on backend
  • Improve DockerContainer handling of null volumes & environment variables
  • Add support for individual timeout and ssl settings on Server
  • Introduce a shell script to monitor for disabled events
  • Introduce two perl scripts (based on packetmischief.ca) to list and kill states
  • Make frontend to not fail when avatars folder is not writable
  • Add automatic_tax collection to the stripe checkout session creation

proditis added 16 commits August 25, 2023 23:45
@proditis
minor updates to cron
0b3d5c7 
in preparation of the new team instance features
@proditis
fix logic bug
ba0e208 
this was letting the last instance rules survive
@proditis
simple shellscript for db servers
bcc0d97 
checks for disabled player_ranks events and enables them back
@proditis
perl script that displays the top talkers from pf
a0f5587
@proditis
similar script with top states one
5e4c512 
this one kills user states that exceed 10000
@proditis
dont fail registration
b964f65 
when avatar folder is not writable
@proditis
we dont need a baseurl we have sysconfig now
75c19a0
@proditis
enable automatic tax calculation
d69dfcd
@proditis
add team allowed columns
b46bd76
@proditis
add ssl and timeout columns on server
1dddaaa
@proditis
make sure we dont fail
ce2642d 
when the variables and volumes are null we had a foreach error
@proditis
add ssl and timeout to backend
c2a521e
@proditis
update dependencies
0052852
@proditis
add team_allowed to backend models and operations
0df6fd2
@proditis
add team_allowed to instance
ec9d758
@proditis
make timeout also dynamic
410ad15
@proditis proditis merged commit 8114ac3 into echoCTF:master Aug 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@proditis