Commit Graph

1078 Commits

Author SHA1 Message Date
Silversthorn
0a3512a18e Merge branch 'dev' into refactor/server_ids 2024-02-02 20:50:08 +01:00
Silversthorn
23ba911686 Fixing same size text everywhere 2024-02-02 20:37:07 +01:00
Zedifus
dc13706a02 Merge branch 'dev' into tweak/unsupported-mc 2024-02-02 17:53:02 +00:00
Andrew
68b0e611be Add new theme for lockout user 2024-01-31 22:00:45 -05:00
Andrew
dc5490cdcb Merge branch 'dev' into feature/anti-lockout 2024-01-31 19:18:55 -05:00
Silversthorn
d92d06e4b1 Fixing issue 322 2024-01-31 23:04:22 +01:00
amcmanu3
02de513f2f Merge branch 'dev' into tweak/unsupported-mc 2024-01-30 21:52:44 -05:00
Silversthorn
98bbf880d0 Fixing Fonts for th-TH 2024-01-30 22:58:19 +01:00
Silversthorn
856caf4a9a trying to improve display for th-TH lang 2024-01-30 22:44:00 +01:00
Silversthorn
1c0190d0ab Impriove display for wssErrors 2024-01-30 22:10:49 +01:00
Silversthorn
e48a3cc976 Improving Display for Buttons 2024-01-30 22:03:58 +01:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01:00
amcmanu3
fb32f64a13 Improve logic just in case minecraft 2.0 2024-01-28 18:22:41 -05:00
amcmanu3
06f59110fe Add warning to wizard for unsupported mc 2024-01-28 17:57:05 -05:00
amcmanu3
00ff98c991 Fix server term command send 2024-01-28 16:20:58 -05:00
amcmanu3
0fa7b592cc Burn retinas - add warning banner
Make warning system more robust
2024-01-28 12:58:02 -05:00
amcmanu3
3d4153f941 Add lockout user for forgot password
Hide lockout user from users list
2024-01-16 15:36:14 -05:00
Andrew
c57d193a59 Merge branch 'bugfix/unicode-logs' into bugfix/unicode-terminal 2024-01-16 14:58:42 -05:00
Zedifus
52533c6dfc Merge branch 'dev' into tweak/player-scroll-bar 2024-01-16 19:36:42 +00:00
Zedifus
c72b209070 Merge branch 'dev' into feature/proxy-stats 2024-01-16 19:24:39 +00:00
amcmanu3
1b047b1733 Remove scroll bars from player management 2024-01-13 18:27:25 -05:00
Andrew
589a11f43c Allow omission of player stats from total 2024-01-13 16:43:16 -05:00
amcmanu3
90806b613c Fix log file output on page 2024-01-12 18:33:21 -05:00
amcmanu3
e3dee7dcd6 Fix indent on checkbox on server config 2024-01-12 13:43:04 -05:00
Zedifus
a564fac8cd Merge branch 'dev' into refactor/server_ids 2023-12-13 02:52:02 +00:00
Zedifus
2d07dbbd9c Merge branch 'dev' into bugfix/backup-dir 2023-12-07 13:52:17 +00:00
Zedifus
cca4f8314b Fix bootbox close function call 2023-12-07 13:31:50 +00:00
Zedifus
c045ded7b5 Merge branch 'dev' into bugfix/support-log-x 2023-12-07 13:28:04 +00:00
Zedifus
1383accefd Merge branch 'dev' into bugfix/config-empty-mounts 2023-12-07 13:05:40 +00:00
Zedifus
b2035eef60 Fix sonar findings 2023-12-07 11:29:18 +00:00
amcmanu3
3df2f23658 Fix bug with backup exclusion save 2023-12-04 23:44:51 -05:00
amcmanu3
c5c025ca8c Fix support log x button still downloading 2023-11-30 12:50:50 -05:00
amcmanu3
304da0da8a Add storage translation to dash
Remote "storage" label if no mounts selected
2023-11-30 12:33:11 -05:00
amcmanu3
52f90f1ee3 Fix monitored mounts when non selected 2023-11-30 12:32:48 -05:00
amcmanu3
ca02c9d575 Add user-based translation to startup 2023-11-30 12:14:09 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -05:00
amcmanu3
aa0eee68e3 Remove border line on loadup 2023-11-29 21:21:28 -05:00
Zedifus
27135d2c93 Merge branch 'dev' into bugfix/unban 2023-11-25 20:00:11 +00:00
Zedifus
8f3dc4d6f2 Merge branch 'dev' into enhancement/server-details 2023-11-25 19:13:29 +00:00
Iain Powrie
05b9812e55 Merge branch 'tweak/homogenize-logo' into 'dev'
Tweak/homogenize logo

See merge request crafty-controller/crafty-4!666
2023-11-25 19:06:52 +00:00
Wout Bouckaert
53b69fe0f6
Remove trailing space for pardon player command. 2023-11-11 12:21:59 -07:00
amcmanu3
a5f4a68c49 Add badge to server detail pages 2023-11-05 12:06:57 -05:00
amcmanu3
28b3a4f8f3 Add loading screen while servers init 2023-11-03 16:41:23 -04:00
Tinyblargon
c08795114e Recreate icons from crafty-logo-square.svg 2023-11-02 13:07:20 +00:00
Tinyblargon
99d5871827 Create svg icon from logo_long.svg 2023-11-02 13:03:36 +00:00
Silversthorn
aa7f47a4f4 Reworking id to use uuid 2023-11-01 18:44:56 +01:00
Andrew
d51e7e3c7d Fix webhook "custom" option appearing 2023-11-01 10:34:19 -04:00
Zedifus
9c0db7af3f Merge branch 'dev' into bugfix/websocket-warning 2023-11-01 02:20:23 +00:00
Zedifus
ee067af0f4 Merge branch 'dev' into bugfix/user-delete 2023-11-01 01:04:22 +00:00
amcmanu3
85225cbdce Fix duplicate function naming on dashboard 2023-10-31 13:26:28 -04:00
amcmanu3
bdb3e94f41 Fix userId reference const declaration 2023-10-30 12:13:14 -04:00
amcmanu3
76e8b01335 Fix notifications not showing up/being reset 2023-10-29 18:37:30 -04:00
Zedifus
1ce9527029 Fix schedule translation spelling 2023-10-22 22:33:18 +01:00
Zedifus
2b5d2e73f6 Merge branch 'dev' into enhancement/improve_webhook_page 2023-10-22 13:58:46 +01:00
Silversthorn
6a2d1fa61a Improving Toggle buttons and Webhook page 2023-10-21 17:32:48 +02:00
Andrew
9760ef6094 Fix console log 2023-10-20 15:38:48 -05:00
Andrew
2461c32641 Auto refresh annoucements every 30 minutes 2023-10-20 15:36:57 -05:00
amcmanu3
7542fb7f02 Merge branch 'sec/script-imports' of https://gitlab.com/crafty-controller/crafty-4 into sec/script-imports 2023-10-18 15:51:21 -04:00
amcmanu3
5f45d2d6a8 Remove internet references 2023-10-18 15:51:19 -04:00
Zedifus
a6783b407e Merge branch 'dev' into sec/script-imports 2023-10-18 20:38:16 +01:00
Zedifus
ca8998e932 Merge branch 'dev' into bugfix/info-icon 2023-10-18 20:26:28 +01:00
amcmanu3
44c2aaada3 Remove external references from front end deps
use secure transfer for jsonschema reference
2023-10-18 14:55:16 -04:00
amcmanu3
bb47623b9b Comply with integrity check 2023-10-18 14:13:03 -04:00
amcmanu3
ffb793a1b9 Fix sonar table description bug 2023-10-18 14:09:25 -04:00
amcmanu3
785334821a Fix info icon on server config page 2023-10-18 13:51:38 -04:00
Zedifus
82eeacf11a Merge branch 'dev' into tweak/user-edit 2023-10-16 20:29:07 +01:00
Silversthorn
2fe862f6a2 Fixing little issue when auto close 2023-10-09 18:57:11 +02:00
amcmanu3
07db332f1c Add translations 2023-10-08 22:30:40 -04:00
amcmanu3
2d32e3ad2a Fix user edits | retain crafty perms
Move password/username edit to bootbox
2023-10-08 22:13:55 -04:00
amcmanu3
5547720a8f Fix js spacing 2023-10-08 17:02:31 -04:00
amcmanu3
b59262802c Fix spacing on functions 2023-10-08 17:02:27 -04:00
amcmanu3
6d9f930e71 Check for super user on user edit 2023-10-08 16:39:04 -04:00
Silversthorn
d31a83a783 prettying Toast 2023-10-08 11:55:11 +02:00
Silversthorn
05ea1baa77 Improve Notifications with Toasts 2023-10-08 11:40:25 +02:00
amcmanu3
612cac4ed2 Fix dashboard to not use ajax 2023-10-07 22:10:24 -04:00
amcmanu3
39d78b92e6 Set password from bootbox 2023-10-07 22:10:15 -04:00
amcmanu3
b1c5836b9b Create forms to username and password changes 2023-10-07 14:42:52 -04:00
amcmanu3
7a6bb657fe Add icons for user password and username 2023-10-07 14:14:46 -04:00
Zedifus
069ff28098 Update changelog !637 2023-10-07 16:50:14 +01:00
amcmanu3
4f994ce211 Remove un-needed console log 2023-10-06 14:24:55 -04:00
amcmanu3
5525413724 Set timeout before calling dir function 2023-10-06 13:33:56 -04:00
amcmanu3
aa5484e96b Retain provider selection on edit 2023-10-05 18:05:12 -04:00
Andrew
6a6ca166bc Accurately display enabled webhook status 2023-09-28 20:00:38 -04:00
Andrew
6a81a5b337 Add accent color option 2023-09-28 19:07:03 -04:00
Andrew
c1b5dbc090 Add translations (english) 2023-09-28 17:47:03 -04:00
Zedifus
f9218ae157 Merge branch 'dev' into feature/discord-webhooks 2023-09-27 21:57:13 +01:00
Zedifus
925f6f6bbb Merge branch 'dev' into bugfix/backups 2023-09-27 21:38:33 +01:00
Zedifus
e1c24ada65 Merge branch 'dev' into enhancement/improve_visibility_wizards_tab 2023-09-27 21:24:34 +01:00
Andrew
f74194f0e5 Fix backups status not showing up 2023-09-26 21:07:56 -04:00
Silversthorn
4f37d5a7f4 Removed unused style 2023-09-25 20:15:49 +02:00
Silversthorn
0f0cd11058 Use nav-pills instead of nav-tabs 2023-09-25 20:15:17 +02:00
Silversthorn
d0c8d7c27a Fixing Dropdown menu closing while removing notifications 2023-09-24 16:28:23 +02:00
Zedifus
65bea2a11a Merge branch 'dev' into feature/discord-webhooks 2023-09-21 23:42:04 +01:00
Zedifus
d765259808 Merge branch 'dev' into bugfix/service-worker 2023-09-21 23:23:35 +01:00
bobsfriend12
a02f42b0a6 remove unecesarry code from service worker 2023-09-20 19:50:30 -05:00
bobsfriend12
2a53c35df7 fix service worker security issue 2023-09-20 19:45:14 -05:00
Andrew
0c02a1511d Fix players not showing up 2023-09-19 20:31:56 -04:00
Silversthorn
1bf8f3bf44 Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-19 22:08:49 +02:00
Zedifus
c0f07747a5 Merge branch 'dev' into tweak/refresh-handler 2023-09-19 19:24:55 +01:00
Zedifus
09ca4d508a Merge branch 'dev' into tweak/file-cursor 2023-09-19 18:35:36 +01:00
Andrew
8c2cfacb4e Use Jar naming schema for refresh 2023-09-08 20:27:47 -04:00
Andrew
096de18c2c Merge branch 'dev' into feature/discord-webhooks 2023-09-05 20:39:20 -04:00
Silversthorn
2d77c456ca Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-05 20:05:12 +02:00
Andrew
84cafe664e Make files hover cursor pointer 2023-09-04 23:38:09 -04:00
Andrew
4f7b2aaa95 Add contrast to number 2023-09-04 23:20:49 -04:00
amcmanu3
2c14a3fd2c Appease the linter 2023-09-04 21:39:40 -04:00
amcmanu3
514bf8453f Appease sonar 2023-09-04 21:21:59 -04:00
amcmanu3
9b7d0d83b5 Appease sonar 2023-09-04 21:14:03 -04:00
amcmanu3
6158ea85b5 Appease sonar 2023-09-04 20:49:55 -04:00
amcmanu3
a8af1bcdf0 Adjust front end styling 2023-09-04 20:42:50 -04:00
amcmanu3
3c5560d3e2 Merge branch 'dev' into feature/arcadia-notifications 2023-09-04 20:38:33 -04:00
Zedifus
e543389ead Merge branch 'dev' into refactor/remote-comms-patch-2 2023-09-05 01:13:50 +01:00
amcmanu3
cdba8c5c69 Appease sonar security 2023-09-04 20:10:00 -04:00
amcmanu3
c1d0902ea5 Appease sonar 2023-09-04 20:05:25 -04:00
amcmanu3
3467c1ccd6 Appease sonar 2023-09-04 19:48:03 -04:00
amcmanu3
097421b34f Appease sonar 2023-09-04 19:45:39 -04:00
amcmanu3
8e1e7f8e11 Appease sonar 2023-09-04 19:43:15 -04:00
amcmanu3
46d7c3eb3c appease sonar 2023-09-04 19:41:59 -04:00
amcmanu3
7134eb2eb8 Appease sonar 2023-09-04 19:40:27 -04:00
amcmanu3
d3df67ba75 Appease Sonar 2023-09-04 19:35:48 -04:00
amcmanu3
9c9f9d3556 Fix file get naming 2023-09-04 19:32:56 -04:00
amcmanu3
fe5e7e8851 Appease sonar 2023-09-04 19:22:32 -04:00
amcmanu3
9d26a8ff8d Make sonar changes 2023-09-04 19:22:11 -04:00
amcmanu3
157b066518 Appease sonar security 2023-09-04 18:31:46 -04:00
amcmanu3
b8210b1a07 Remove sonar "bugs" 2023-09-04 18:26:04 -04:00
amcmanu3
4cd8e540f7 Revert "Poll notifications on an hourly schedule"
This reverts commit 98720aa072.
2023-09-04 17:46:22 -04:00
amcmanu3
98720aa072 Poll notifications on an hourly schedule 2023-09-04 17:30:47 -04:00
amcmanu3
bc71e4e5fd Force cache refresh on reload 2023-09-04 14:19:21 -04:00
amcmanu3
977da1049d Had to remove a line somewhere 2023-09-04 14:00:34 -04:00
amcmanu3
10f696edcc Make server logs call API 2023-09-04 13:54:24 -04:00
amcmanu3
16e01aed85 Remove ajax notif 2023-09-04 13:31:15 -04:00
amcmanu3
a73063f279 Fix bug on master server dir 2023-09-04 13:30:56 -04:00
amcmanu3
e79f33fcc4 Add login photo to API v2 2023-09-04 13:30:48 -04:00
amcmanu3
adaaff3d23 Add master server dir to API v2 2023-09-04 12:34:39 -04:00
amcmanu3
153781c78e Add cache refresh to api v2 2023-09-04 12:12:02 -04:00
amcmanu3
a6b7b84b3b Add get/delete functions for api keys 2023-09-04 11:42:07 -04:00
amcmanu3
6a4a9f77d9 Add create new API key from api v2 2023-09-03 23:30:26 -04:00
Andrew
13539d83a9 add style 2023-09-03 17:27:09 -04:00
amcmanu3
afb7b91b7a Add files functions to API v2 2023-09-03 16:15:38 -04:00
amcmanu3
90905a70f5 General bug fixes/upload support 2023-09-03 13:23:18 -04:00
Silversthorn
af1fdb447a Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-02 21:55:51 +02:00
Silversthorn
34fe9c1326 Using API Call for Status Page 2023-09-02 21:51:28 +02:00
Zedifus
4c7f95675b Merge branch 'dev' into enhancement/better-InApp-doc-display 2023-09-02 14:03:25 +01:00
Zedifus
8f5cb62c25 Merge branch 'dev' into bugfix/public-status-servers 2023-09-02 13:47:34 +01:00
Zedifus
e0b425c659 Merge branch 'dev' into bug-fix/service-worker 2023-09-02 13:28:57 +01:00
Andrew
5266e6e098 style ul 2023-09-01 20:38:10 -04:00
Andrew
6c1e1b4737 Add Arcadia Notifications to Front end 2023-09-01 14:48:20 -04:00
amcmanu3
f6c61e1764 Add bedrock request for files
TODO: Finish zip imports
2023-08-31 21:35:50 -04:00
amcmanu3
d9e405e56c Add eula to download 2023-08-27 14:55:21 -04:00
Silversthorn
29f7399708 Adding API route for history stats
Fixing close db connexion for stats
2023-08-27 13:50:22 +02:00