Iain Powrie
34d260462d
Merge branch 'experimental/feature/permission-matrix' into 'dev'
...
Add a permission matrix to the role add and edit
See merge request crafty-controller/crafty-4!262
2022-05-18 21:20:02 +00: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
Andrew
fec92c62b4
Merge branch 'tweak/pretzel-cron-explain' into 'dev'
...
Change Cron Validation / Fix Security Issues with Role/User Creation
See merge request crafty-controller/crafty-4!263
2022-05-18 20:43:26 +00:00
amcmanu3
cfcc446d17
Remove TODO
2022-05-18 16:41:14 -04:00
amcmanu3
0f661d5400
Disable checkboxes until server access
2022-05-18 16:37:38 -04: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
amcmanu3
3432d660ef
Expand Cron explain
2022-05-19 11:04:13 -04:00
luukas
d67711e898
Fix cq degradation: C0411
2022-05-18 13:04:38 +03:00
luukas
8737c15fcf
Add a permission matrix to the role add and edit
2022-05-18 01:09:58 +03:00
Iain Powrie
8cca74f355
Merge branch 'translation/italian-updated-alpha-3.5' into 'dev'
...
Update it_IT lang to 3.5
See merge request crafty-controller/crafty-4!260
2022-05-16 20:55:54 +00:00
Iain Powrie
1c15e6c0a9
Update it_IT lang to 3.5
...
Thanks Gallu
2022-05-16 20:38:49 +00:00
Andrew
7d8515321b
Revert bad changes for schedules
2022-05-15 15:59:55 -05:00
Andrew
39e748c9c4
Merge branch 'tweak/pretzel-files-design-change' into 'dev'
...
Files design change / Stats Collection on Offline servers
See merge request crafty-controller/crafty-4!257
2022-05-15 20:29:49 +00:00
Andrew
4f6a90eb6a
Remove unused import
2022-05-15 14:05:23 -05:00
Andrew
490fc86d4e
Cleanup server schedule on delete
2022-05-15 14:00:24 -05:00
Andrew
e161e2cf0b
Add cleanup method for server stats on delete
2022-05-15 13:28:02 -05:00
Andrew
0f19c0c787
Realtime server stats all the time
2022-05-15 13:16:28 -05:00
Andrew
984f4cc4d6
Change Files Aesthetic
2022-05-15 12:38:48 -05:00
Andrew
8e9d88b8f9
Merge branch 'bug/pretzel-terminal-spacing' into 'dev'
...
Term spacing between player name and message
See merge request crafty-controller/crafty-4!256
2022-05-15 02:19:38 +00:00
Andrew
30618c7456
Term spacing between player name and message
2022-05-14 20:53:18 -05:00
Andrew
63ca08e072
Merge branch 'tweak/pretzel-date-uptime' into 'dev'
...
Add date to uptime calc.
See merge request crafty-controller/crafty-4!255
2022-05-15 00:17:02 +00:00
Andrew
5fa209bf52
Add date to uptime calc.
...
Big assist from Zedifus
2022-05-14 18:51:05 -05:00
Zedifus
4880950469
Revert GitHub > Gitlab
2022-05-12 00:24:18 +01:00
Andrew McManus
e25d6222e3
Merge pull request #28 from arcadia-technology/tweak/pretzel-apache-edit
...
Change apache config path to match crafty4 naming
2022-05-10 20:28:26 -04:00
amcmanu3
4849a348a6
Change apache config path to match crafty4 naming
2022-05-10 20:24:53 -04:00
Andrew McManus
0a97fd112b
Merge pull request #25 from arcadia-technology/dev_DBManagement
...
Moving Server Stats DB to Server Folder
2022-05-09 15:22:30 -04:00
Andrew
184e50a825
Fix bug where excluded dir not persistant
2022-05-09 13:34:45 -04:00
Zedifus
c7f35df1bf
Merge pull request #27 from arcadia-technology/devops/windows-macos-pipeline-matrix
...
Windows pipe conversion and new macOS executable ✨
2022-05-07 20:42:19 +01:00
Zedifus
e521036c1c
Add action matrix for win and mac pipes
...
Was going to do .app/ and include a .icns
but running with no-console was problematic, but macos works as binary.
Will revisit to make pretty but base support is there.
2022-05-07 20:31:00 +01:00
Silversthorn
84078935e8
Sorry, I forgot this one :/
2022-04-28 22:40:27 +02:00
Silversthorn
0dcdc8ffc7
pylint happy ? ^^
2022-04-28 22:40:24 +02:00
Silversthorn
16bbac7fd6
Moving Server Stats DB to Server Folder
2022-04-28 22:40:15 +02:00
Andrew McManus
39a5b89b92
Merge pull request #24 from arcadia-technology/bug/file-size-check
...
Bug/file size check
2022-04-20 15:43:43 -04:00
Zedifus
521f44bc6e
Merge pull request #23 from arcadia-technology:devops/lint-pipes-to-actions
...
Add linting pipes
2022-04-20 18:45:30 +01:00
Zedifus
e1e362cc6a
Add linting pipes
...
Also tweaked docker-build naming.
2022-04-20 18:41:35 +01:00
Andrew
3c666e5702
Fix stack thrown on page refresh after clean db
2022-04-17 13:33:45 -04:00
Andrew
77bbde149a
Fix fresh install side effects from DB rework
2022-04-17 13:27:00 -04:00
Andrew
fc1304d729
Fix file size bug when destination does not exist
2022-04-17 13:00:05 -04:00
Zedifus
0ed7fa0ae9
Merge pull request #21 from arcadia-technology:devops/readme-ghcr-documentation
...
Add badges and ref's for ghcr
2022-04-17 01:25:45 +01:00
Zedifus
c74db6f7e5
Add badges and ref's for ghcr
2022-04-17 01:25:08 +01:00
Zedifus
ff45160516
Merge pull request #20 from arcadia-technology:devops/docker-build-pipeline
...
Convert docker build pipes from gitlab to Actions
2022-04-17 01:00:57 +01:00
Zedifus
7997580bec
Add Docker build pipeline
...
dockerhub commented out until full release
2022-04-17 00:58:33 +01:00
Zedifus
e8d96078be
Update oci tags to link with github
...
Gitlab you broke my heart 💔
2022-04-17 00:57:40 +01:00
Zedifus
140a8d29ea
Remove .github from image
2022-04-17 00:56:44 +01:00
Iain Powrie
dfd26e4523
Merge branch 'devops/correct-docker-examples' into 'dev'
...
Correct docker documentation to include restart
See merge request crafty-controller/crafty-4!253
2022-04-15 15:36:31 +00:00
Iain Powrie
4748f6794a
Fix doc indentation
2022-04-15 15:35:56 +00:00
