Andrew
300c19de42
Merge branch 'bug/File-Drag-Drop' into 'dev'
...
Fix bug where users could not drag files
See merge request crafty-controller/crafty-commander!247
2022-04-12 21:42:05 +00:00
Andrew
47025bec2a
Make helper not static when unzipping.
2022-04-12 17:38:05 -04:00
Andrew
ec6421b62c
Disable Backups when no path
2022-04-12 17:37:20 -04:00
Andrew
12b0f8326d
Fix bug where no backup dir would exist on clone
2022-04-12 17:17:12 -04:00
Andrew
cbd99f2ccc
Fix bug where users could not drag files
2022-04-12 15:27:03 -04:00
computergeek125
d417950eae
fix fstrings, refactored console to static
2022-04-11 20:34:46 -05:00
Zedifus
b5cac0e385
Fix remaining minor lint warnings
...
These can't be handled by ⬛ black automatically
2022-04-11 11:14:32 +01:00
Zedifus
19f2429a4c
Fix formatting to comply with ⬛ Black
2022-04-11 11:08:36 +01:00
computergeek125
42ca4bb973
Refactored the yes to not pass objects in import
...
Merge Conflicts ᴙ Us
2022-04-11 00:23:55 -05:00
computergeek125
f42a697837
Merge branch 'dev' into macgeek.db
2022-04-10 18:10:22 -05:00
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
computergeek125
119c34535c
Removed fn, reduced queries in login flow
2022-04-10 17:46:07 -05: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