xithical
464428ea7e
Remove erroneous print statements
2022-06-18 16:29:36 -05:00
xithical
8b6d70ba9a
Fix bug where non-superusers could not edit their own API keys
2022-06-18 16:27:06 -05:00
Andrew
31097da971
Fix type issue comparing
2022-06-18 17:06:44 -04:00
Andrew
a8cd982b96
Fix warning message
2022-06-18 17:03:44 -04:00
Andrew
37765dbebc
Fix general user can view any api-key page
2022-06-18 17:02:10 -04:00
Andrew
72f97e4ff0
Fix issue where any user could add/remove api keys
2022-06-18 16:55:39 -04:00
Andrew
fd0da1ef20
Fix any user can recieve all api keys
2022-06-18 16:20:57 -04:00
Andrew
e9bf2af83b
Add wiki iframe as requested.
2022-06-18 15:57:37 -04:00
Andrew
e435292a52
Fix blank server_detail page for general users
2022-06-17 00:58:18 -04:00
Iain Powrie
43906d531e
Merge branch 'bug/support_logs' into 'dev'
...
Bug/support logs
See merge request crafty-controller/crafty-4!354
2022-06-16 16:56:56 +00:00
amcmanu3
e3d289e6fd
Fix support logs download issues
2022-06-16 12:11:21 -04:00
amcmanu3
35518e960f
Fix username capital issues once and for all
2022-06-16 09:52:21 -04:00
amcmanu3
17ef71046c
Merge branch 'master' into dev
2022-06-14 15:49:32 -04:00
amcmanu3
50438c485b
Fix support log delete order.
...
Fix username uppercase.
2022-06-14 15:42:13 -04:00
luukas
e73dd682c8
Fix no-else-* QA warnings
2022-06-14 15:40:57 +03:00
amcmanu3
b3f167ab62
Add fallback for tz not being found
2022-06-13 14:29:25 -04:00
Andrew
25a1c67c26
Fix black formatting
2022-06-12 17:17:58 -04:00
Andrew
474597d16c
Add survery to admin first log
2022-06-12 17:03:42 -04:00
Silversthorn
a9cdd33c77
Fixing Pylint Errors
2022-06-12 18:30:39 +02:00
Silversthorn
007218111f
Should work now :)
2022-06-12 17:13:39 +02:00
amcmanu3
ddcd3dc5c3
Appease the linter
2022-06-11 17:46:36 -04:00
amcmanu3
e99cacfc53
Make call to controller and not stale object
2022-06-11 17:34:31 -04:00
Andrew
b793016c03
Redefine how servers are served to panel_handler
2022-06-02 07:34:17 -04:00
Andrew
273e2f465d
Only show authorized servers on role creation
2022-06-01 19:26:57 -04:00
Andrew
ec730a1694
Merge branch 'bug/pretzel-support-log-temp-cleanup' into 'dev'
...
Cleanup temp dirs on support log creation
See merge request crafty-controller/crafty-4!286
2022-06-01 22:33:52 +00:00
Andrew
8e0ccd4f94
Fix indexing for updates made on branch
2022-06-01 18:25:27 -04:00
Andrew
5d3badef2c
Cleanup temp dirs on support log creation
2022-06-01 17:54:58 -04:00
Silversthorn
f597a26e5b
Trying to fix stuff
2022-05-30 22:05:36 +02:00
Silversthorn
b0ea943992
Fixing lasts pylint warning
2022-05-30 19:32:11 +02:00
Silversthorn
8f5c688b72
Fixing Pylint issues
2022-05-30 19:28:39 +02:00
Silversthorn
37bda32164
Fixing moved functions calls
2022-05-30 07:36:25 +02:00
Silversthorn
3b4253de9b
Fixing get_authorized_server
2022-05-26 23:19:59 +02:00
Silversthorn
99b28efd33
Merge branch 'dev' into dev-StatsDBImprovement
2022-05-26 15:39:52 +02:00
Silversthorn
8423cc24c1
I'm breaking/fixing stuff
2022-05-26 14:50:20 +02:00
luukas
0d62223982
Merge branch 'dev' into bugfix/api-v2-bugfixes
2022-05-23 20:20:49 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash
2022-05-20 22:04:41 +03:00
luukas
9ddcd13f2f
Fix W0611 & R1734 lint issues
2022-05-20 14:06:46 +03:00
luukas
bd4a35b418
Make role add and edit use API v2 internal APIs
2022-05-19 16:13:25 +03:00
amcmanu3
67e20302c9
Add get_perms_server back
2022-05-18 19:19:58 -04:00
Andrew
b7780682d5
Merge branch 'dev' into 'merge/api-v2'
...
# Conflicts:
# app/classes/controllers/crafty_perms_controller.py
2022-05-18 21:56:39 +00:00
luukas
6407900609
Merge branch 'dev' into experimental/lukas-cleanup
2022-05-19 00:52:59 +03:00
amcmanu3
bc6309c91b
Appease the linter
2022-05-18 16:56:54 -04:00
Andrew
ca73a5f60b
Merge branch 'dev' into 'experimental/feature/permission-matrix'
...
# Conflicts:
# app/classes/web/panel_handler.py
2022-05-18 20:47:43 +00:00
luukas
8b0da5da4c
Remove unnecessary prints or use logger.debug
2022-05-18 22:06:33 +03:00
amcmanu3
a833a29fb7
Allow super users to add roles/users
2022-05-18 14:35:51 -04:00
amcmanu3
12390306fd
Add permissions checks for quantity for users/role
...
Remove the ability to add quantities for general users.
2022-05-18 14:33:22 -04:00
amcmanu3
e3248e8657
Change cron validation to allow day abbreviations
2022-05-18 13:53:55 -04:00
luukas
8737c15fcf
Add a permission matrix to the role add and edit
2022-05-18 01:09:58 +03:00
luukas
5dfd1aae12
Make more places use the check_server_id function.
2022-05-17 20:52:32 +03:00
luukas
0115421243
Make queries narrower
2022-05-16 01:02:17 +03:00
luukas
27d310e2de
Declutter set()s
2022-05-16 00:55:22 +03:00
luukas
930c6936d9
Add more advanced role APIs
2022-05-10 02:08:49 +03:00
luukas
bf59e2de6c
Add and fix API v2 and db
...
* Add basic role routes
* Add API v2 404 handler
* Add API v2 home handler pointing to the wiki
* Add tons more todos
* Add get_*_columns and get_*_column functions for many db models
* Modify and add tons of model and controller functions
2022-05-08 00:07:55 +03:00
luukas
53459d83dc
Merge branch 'feature/api-v2' into merge/api-v2
2022-05-05 03:32:09 +03:00
luukas
1aa0d65cf7
Merge branch feature/external-frontend to feature/api-v2 without the frontend
2022-04-14 15:33:53 +03:00
Zedifus
92c8fc04f3
Refactor to standardize class/variable naming ✨
2022-04-14 03:10:25 +01:00
Andrew
bb2c1de418
Fix bug where general user could not create sch
2022-04-12 18:49:50 -04: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
amcmanu3
3b50130f40
Fix bug - non-super users could not create servers
2022-04-10 19:01:53 -04: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
amcmanu3
c7394ab77e
Add ability for users to disable hints
2022-04-02 21:25:26 -04: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
Andrew
f78d59fd34
Server jars/gravatar would stack with no internet
2022-03-27 18:09:49 -04:00
Zedifus
2a512d7273
Fix files to conform with new ⚫ Black pylintrc
...
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
2022-03-23 06:06:13 +00:00
Zedifus
e06fe8a52a
⬛ Black codebase
...
Apply black formatting to codebase
2022-03-23 02:50:12 +00:00
Andrew
ecc87a6137
Add context menu for iOS + Bug fix
2022-03-22 14:24:15 +00:00
Andrew
5682455bcc
Appease the linter
2022-03-20 12:39:57 -04:00
Andrew
d311ccbfa1
Remove print statement everytime a page loads
2022-03-20 07:05:11 -04:00
amcmanu3
0f27b2df91
Fix error where user could not create server
...
Fix error where user could not create support files
2022-03-14 17:39:19 -04:00
Andrew
b5dac31ad5
Fix bug where you cannot create user without stack
2022-03-13 22:31:48 -04:00
Andrew
3a8174cc22
Add status bar for support log archive
2022-03-13 08:29:26 -04:00
Andrew
8858780d41
Move backups to ajax request
2022-03-11 00:18:22 -05:00
Zedifus
b306d1f313
Tidy imports & dep auto-installer
2022-03-08 04:40:44 +00:00
Silversthorn
506129729e
Update Translation
...
- Adding Translation for Credits Page
- Adding detection support for webpage
2022-03-05 12:01:36 +01:00
Zedifus
a3656536b5
Remove '*' Prefix from joke languages
...
Co-authored-by: Andrew McManus <amcmanus@arcadiatech.org>
2022-03-04 23:38:36 +00:00
Andrew
a76833b409
Optimize looping for server list nav
2022-03-04 12:42:12 -05:00
amcmanu3
0a08324963
Fix server reordering
2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79
Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev
2022-03-03 22:22:08 -05:00
amcmanu3
4a32744211
Fix indent causing server ordering to not work
2022-03-03 22:22:05 -05:00
amcmanu3
d5c623b928
Merge branch 'dev' into dev-RefreshStats_Threading
2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca
Appease the linter
2022-03-03 19:47:49 -05:00
amcmanu3
ab7889914f
Bug fixes to ensure player stats display correctly
...
Add sync indicator to dashboard
2022-03-03 19:41:30 -05:00
Andrew
d73316119b
Add server download status indicator
2022-03-04 00:36:36 +00:00
Andrew
e0b8fb35fe
Add option to compress backups
2022-03-02 11:34:26 -05:00
Andrew
15610210b9
Fix bug in schedule creation where if interval was days an execption would be thrown for a missing key
2022-03-02 10:49:03 -05:00
Andrew
8e874ca997
Add option to disable language files through config.json
2022-03-02 10:30:40 -05:00
xithical
c4f706d415
Rework of files handling and added exclusions selection for backups.
2022-03-01 01:02:30 +00:00
xithical
26014d0e86
Revert "Merge branch 'xithical-fixes' into 'dev'"
...
This reverts merge request !173
2022-02-28 04:40:33 +00:00
Andrew
3621672e81
appease the linter
2022-02-27 22:03:19 -05:00
Andrew
70ba8cceec
Add fully working backups
2022-02-27 21:49:26 -05:00
Andrew
2bf2902754
Working backup exclusions
2022-02-27 21:40:05 -05:00
Andrew
5fa04d5ccc
Refactor tasks.html to schedules.html to match naming scheme
2022-02-26 20:23:20 -05:00
Andrew
09335fc3d9
Add ability to reorder servers based on user
2022-02-26 18:00:54 -05:00
Andrew
18e2ac8328
Change zip import execution string to the correct one
...
Fix front end for bedrock imports
Add server type to details
2022-02-26 12:29:07 -05:00
Andrew
96d52376f3
Fix bug where new schedules could not be created
2022-02-25 20:50:07 -05:00
Andrew
58c9321c8f
fix bug where schedules would not be able to be created.
2022-02-25 20:43:33 -05:00
Andrew
45ae49e84e
Add features to child tasks
2022-02-25 19:53:38 -05:00
Andrew
31cb2793fd
Fix a couple bugs with chain reactions
2022-02-24 00:19:54 -05:00
Andrew
af16834419
Working chain reactions
2022-02-23 22:59:16 -05:00
Zedifus
1596c720cb
Add ability to load credits from remote
2022-02-10 06:13:52 +00:00
Andrew
3995560ba2
Enable/disable crash detection on setting change in config
2022-01-30 21:04:08 -05:00
Andrew
ac19c86089
Appease the linter
2022-01-30 15:34:09 -05:00
Andrew
37ccc447c4
Fix backup config bug
2022-01-29 16:37:00 -05:00
Andrew
8000acd74d
Fix bug where server_obj method was not defined
2022-01-28 19:12:57 -05:00
Andrew
d1db65dc9c
Fix typo when messages from players are written
2022-01-28 19:00:14 -05:00
Andrew
005ac1216e
Add crash detection
2022-01-27 20:43:23 -05:00
Iain Powrie
e0ce1d118c
Create pylintrc, code review pipeline & correct codebase errors
...
Fix uploads,
Only send server stats to user page when they have access to servers
2022-01-26 01:45:30 +00:00
Andrew
33984c9629
Fix for perms error thrown when posting api key from regular user
2022-01-20 14:14:03 -05:00
Andrew
7f45b0544a
new windows fix for space escaping
2022-01-19 17:08:29 -05:00
Andrew
4fe174d6d2
additonal fix to windows path bug
2022-01-19 16:47:51 -05:00
Andrew
dff7c4890b
push changes to fix loading server pages as regular user. Creating new api keys as a regular user does not work - get a white traceback.
2022-01-19 16:22:22 -05:00
Andrew
6f860e967c
final changes for windows path issues
2022-01-19 15:14:56 -05:00
Andrew
cebb25b5e9
add try execpt around task scheduling. Fix edit task bug. Fix permission issue after JWT merge
2022-01-19 13:07:26 -05:00
Andrew
f37e1e04a4
Fix gravatar not loading after being removed from cookie. Improve gravatar loading so it changes without relogging
2022-01-18 16:44:36 -05:00
Lukas
09bd01a634
Merge branch 'dev' into 'lukas-jwts'
...
# Conflicts:
# app/classes/web/panel_handler.py
# app/frontend/templates/notify.html
# app/translations/en_EN.json
# requirements.txt
2022-01-16 10:54:55 +00:00
luukas
a20f7c4acf
Fix translation stuff
...
* Make fallback stuff work
* Use helper.get_setting('language') instead of hardcoded 'en_US'
* Fix status and public pages lang variables
* Fix and add some translations for fi_FI
2022-01-15 17:38:08 +02:00
Andrew
fefa6248b4
Remove time from cron dbs
2022-01-15 02:01:51 -05:00
Andrew
0d3fc43931
Remove schedules from DB when deleting a server.
...
Add better messaging for support log prep.
Add english translation for notify.
Chnage dep to 4.0 for tzlocal
2022-01-14 23:53:44 -05:00
Andrew
43a315874e
Fix player data bug
2022-01-14 20:05:50 -05:00
luukas
93857f90db
JWT login and multi API keys!
2022-01-15 02:23:50 +02:00
Andrew
2689a579a7
fix bug where transveral would be true every delete file due to typo
2022-01-14 16:06:02 -05:00
Andrew
8723a44402
better cron validation
2022-01-14 12:59:33 -05:00
Andrew
210b831a47
remove schedule import from servers
2022-01-14 12:57:23 -05:00
Andrew
8424fc3149
Put support logs into a thread.
2022-01-13 20:42:53 -05:00
Andrew
4a78f3c4bd
update support logs to only download server logs for user permissions. Fix bug where updating user roles would update for all user roles with changes.
2022-01-13 16:44:57 -05:00
Andrew
3a3ee52f5c
add logging for file downloads
2022-01-13 00:56:32 -05:00
Andrew
9f798ff291
Add popover for tasks mobile
...
Add support logs download feature
2022-01-12 21:12:28 -05:00
Andrew
e310d0e48b
changing interval start times to midnight. not when the schedule was created. I think this will be more what people are expecting.
2022-01-12 11:33:08 -05:00
Andrew
e63966e7e6
fixing enabled bug in tasks for editing tasks
2022-01-11 19:20:26 -05:00
Andrew
b6a10d828e
fix enable bug in tasks
2022-01-11 19:17:20 -05:00
Andrew
47b48c3ee4
Fix translations in schedules
2022-01-11 18:51:07 -05:00
Andrew
b9cf5fdbf9
Fix so bad cron characters will not destroy DB.
2022-01-11 17:41:46 -05:00
Andrew
51fcb2adc3
Add working schedules.
...
Add ability to edit schedules.
Add new pages for task creation/edit.
2022-01-11 17:24:05 -05:00
Andrew
5e7d0d64bd
Cron tasks working.
...
Starting to rearrange front end for better UX
2022-01-11 12:17:57 -05:00
Andrew
c220c6d3d3
Remove schedule logic from backups.
2022-01-11 01:45:54 -05:00
Andrew
4f55ffed0f
Add single execution to scheduled tasks.
2022-01-11 01:29:27 -05:00
Andrew
14ae7c9a46
Add working schedules.
...
Do not use advanced cron scheduling yet.
Ability to add/delete scheduled jobs.
2022-01-11 00:26:33 -05:00
Andrew
139b506554
Inital APScheduler code for integration with our SQLite DB in progress. Adding commands works with start/stop/restart
2022-01-10 20:11:52 -05:00
Andrew
73c6c1b871
Fix port reminder
...
Add Server time zone to details
2022-01-10 14:58:38 -05:00
Andrew
70cc90549d
Minor fixes to user deletion.
...
Allow users with user permissions to delete users...wow. How many times can I say user?
2022-01-09 23:34:11 -05:00
Andrew
db6a886e0f
Fix minor bugs in super user activation. Add 'are you sure' to delete user
2022-01-09 23:16:11 -05:00
Andrew
369ac7ad15
initial changes for zip imports selection
2022-01-09 18:04:54 -05:00
Andrew
7dd24b6b15
Improved File Loading, Fixed Port checking
2022-01-08 23:03:45 +00:00
Andrew
8a2f938dc9
Fix user error when trying to edit own language
...
Fix bug where users could not be created because of a bad logical check for system uesr.
2021-12-21 15:39:33 -05:00
Andrew
71d3e03875
Add final fix for system user
2021-12-20 23:04:07 -05:00
Quentin B
f018267b62
Made server polls asynchronus, fix for serverjars
2021-12-16 21:07:36 -05:00
Andrew
ebe65e081f
Minor change to aestetic for tasks
2021-11-30 15:50:40 -05:00
