Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,289 Commits 12 Branches 45 Tags 104 MiB
647cf57d2e
Commit Graph

1289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew
647cf57d2e Merge branch 'revert-d0b17c8d' into 'dev' 
Fix bug - non-super users could not create servers

See merge request crafty-controller/crafty-commander!245
 2022-04-10 23:05:25 +00:00
amcmanu3
3b50130f40 Fix bug - non-super users could not create servers 2022-04-10 19:01:53 -04:00
Andrew
d78d51d091 Merge branch 'revert-d0b17c8d' into 'dev' 
Revert "Merge branch 'bug/DB_Lock' into 'dev'"

See merge request crafty-controller/crafty-commander!243
 2022-04-10 22:16:28 +00:00
amcmanu3
711d415335 Remove queue 2022-04-10 18:04:16 -04:00
Andrew
19d2c9ec1c Revert "Merge branch 'bug/DB_Lock' into 'dev'" 
This reverts merge request !241
 2022-04-10 22:00:44 +00:00
Andrew
bb66b85b9d Merge branch 'bug/API_Users' into 'dev' 
Fix bug where any user could see all stats

See merge request crafty-controller/crafty-commander!242
 2022-04-10 21:32:56 +00:00
amcmanu3
63c199a835 Fix bug where any user could see all stats 2022-04-10 17:30:48 -04:00
Andrew
d0b17c8d5d Merge branch 'bug/DB_Lock' into 'dev' 
CRITICAL: Move all other models to Queue DB.

See merge request crafty-controller/crafty-commander!241
 2022-04-10 21:08:07 +00:00
amcmanu3
dd5dac6336 Appease Black 2022-04-10 17:02:48 -04:00
amcmanu3
3826cb3486 Change all databases to queue 2022-04-10 16:33:54 -04:00
Andrew
d3d8cee83c Merge branch 'feature/API' into 'dev' 
Add API v1 for 4.0 - Fix DB Lock

See merge request crafty-controller/crafty-commander!238
 2022-04-10 19:39:31 +00:00
Andrew
b1ed9ba2bd Add API routes from 3.x 
Enhance security for permissions on API requests
Fix bug where server permissions and crafty permissions were flipped upon making a new token
Fix bug where new secret key would be created every time Crafty was started.
Fix bug where DB locks will occur with concurrent writes to the DB.
 2022-04-10 19:39:31 +00:00
Andrew
7dc1047db9 Merge branch 'bug/player-controls' into 'dev' 
Fix bug where server id was hard coded on cmd send

See merge request crafty-controller/crafty-commander!236
 2022-04-03 03:43:22 +00:00
amcmanu3
9a6152abdd Add end quote 2022-04-02 23:34:58 -04:00
amcmanu3
f921f777eb Enhance file save feedback 2022-04-02 23:21:21 -04:00
amcmanu3
82df93c700 Fix bug where server id was hard coded on cmd send 2022-04-02 22:44:40 -04:00
Andrew
261a57e034 Merge branch 'tweak/password-suggestion' into 'dev' 
QOL Fixes

See merge request crafty-controller/crafty-commander!235
 2022-04-03 01:51:10 +00:00
amcmanu3
71fd416fd0 Appease Zedifus 2022-04-02 21:47:32 -04:00
amcmanu3
c7394ab77e Add ability for users to disable hints 2022-04-02 21:25:26 -04:00
amcmanu3
4166d99885 Change password name 2022-04-02 20:37:22 -04:00
Andrew
8d79d0777f Merge branch 'tweak/better-failure-feeback' into 'dev' 
Add max stream size to config.json

See merge request crafty-controller/crafty-commander!234
 2022-04-02 20:09:38 +00:00
amcmanu3
ade6c9f1b8 Make stream size calc more readable 2022-04-02 16:07:31 -04:00
Iain Powrie
505f06825a Merge branch 'bugfix/lint-corrections' into 'dev' 
Bugfix/lint corrections

See merge request crafty-controller/crafty-commander!233
 2022-04-02 19:58:51 +00:00
amcmanu3
03ce4ec517 Add ability to use ctrl + s 
Add save status indicator
 2022-04-02 15:57:11 -04:00
amcmanu3
657d3e92f2 Add max stream size to config.json 
Add ability to translate error message
 2022-04-02 13:50:40 -04:00
amcmanu3
dc69a8a9f2 Add better feedback on upload max size failure 2022-04-02 13:06:20 -04:00
Zedifus
23ecef6826 Revert Singleton testing operators on db querys 
These are not compatible with peewee querys, see MR !233 for details
 2022-04-02 17:54:30 +01:00
Zedifus
e6b1eef4c2 Remove more unnecessary singleton lint exemptions 
If testing truthy/falsy we should be using is
 2022-04-02 02:58:31 +01:00
Zedifus
db70f9ae20 Fix W0221 emptyline override 
Package advises override, see !233 for doc reference.
 2022-04-02 02:49:48 +01:00
Zedifus
0c540293d8 Fix Singleton value testing 
Truthy falsy truthy falsy, apparently wants 'is'
 2022-04-02 02:34:12 +01:00
Andrew
f00830aeb5 Merge branch 'bug/general-user-gravatar' into 'dev' 
Bug/general user gravatar

See merge request crafty-controller/crafty-commander!232
 2022-04-02 01:11:01 +00:00
Andrew
8e704b61ca Fix naming on super user variables 2022-04-01 18:09:55 -04:00
Andrew
1242b318c8 Fix bug - general user could not add gravatar 2022-04-01 18:04:42 -04:00
Iain Powrie
af0e6252a3 Merge branch 'bug/gravatar-stack' into 'dev' 
Bug/gravatar stack

See merge request crafty-controller/crafty-commander!231
 2022-03-31 08:28:44 +00:00
Iain Powrie
f253f33f87 Merge branch 'feature/apache2-default-wss' into 'dev' 
Feature/apache2 default wss

See merge request crafty-controller/crafty-commander!230
 2022-03-31 08:24:16 +00:00
amcmanu3
d15bae8df7 Add credit for Zedifus 2022-03-30 14:56:50 -04:00
Andrew
f78d59fd34 Server jars/gravatar would stack with no internet 2022-03-27 18:09:49 -04:00
Andrew
cf42ff72eb Add apache requirement notes 2022-03-27 17:30:01 -04:00
Andrew
0f78c4b2a3 Add apache2.conf.example for rev proxy 2022-03-27 17:27:03 -04:00
Andrew
c93824de7c Add quotes to fix formatting 2022-03-27 17:26:48 -04:00
Andrew
dc72ac5c3e Merge branch 'bug/CPU-Usage' into 'dev' 
Add sleep to realtime - Reduce CPU load.

See merge request crafty-controller/crafty-commander!228
 2022-03-26 23:48:18 +00:00
Andrew
822a3707b2 Add sleep to realtime - Reduce CPU load. 2022-03-26 19:10:04 -04:00
Iain Powrie
8f95b0a96a Merge branch 'tweak/add-default-env-to-ignore' into 'dev' 
Add default.env to .gitignore

See merge request crafty-controller/crafty-commander!227
 2022-03-26 21:37:04 +00:00
Iain Powrie
03b6c246e6 Add default.env to .gitignore 2022-03-26 21:33:19 +00:00
Iain Powrie
dfe7b05415 Badge Update 
Fix supported versions, link correctly to python home
 2022-03-26 16:46:54 +00:00
Iain Powrie
391e23a328 Merge branch 'devops/tweak/dockerfile-label-ordering' into 'dev' 
Move our oci labelling of the image to the end

See merge request crafty-controller/crafty-commander!226
 2022-03-24 22:50:25 +00:00
Zedifus
ca78e79076 Move our labeling of the image to the end 
This is so we don't recache all the layers on a version number change
That would be silly😅
 2022-03-24 22:47:04 +00:00
Iain Powrie
553ec0900d Merge branch 'devops/fix-oci-version-annotation' into 'dev' 
Strip string doublequotes from meta jq output

See merge request crafty-controller/crafty-commander!225
 2022-03-24 22:16:28 +00:00
Zedifus
0f41e1ae25 Strip string doublequotes from meta jq output 2022-03-24 22:07:50 +00:00
Iain Powrie
cd0a6c0e88 Merge branch 'devops/minute-improvements-and-meta-tags' into 'dev' 
Further fine tuning to better miniutes and add meta tags.

See merge request crafty-controller/crafty-commander!224
 2022-03-24 21:49:28 +00:00