Commit Graph

585 Commits

Author SHA1 Message Date
Silversthorn
d87a2c4c17 Revert "Fix scrolling of sidebar"
This reverts commit 99693324dc.
2022-10-04 23:03:42 +02:00
Zedifus
4d74a1e3c0 Merge branch 'dev' into bug/zip-import-conditional 2022-10-03 22:26:22 +01:00
amcmanu3
03320c375a Fix conditional issue with zip imports/uploads 2022-10-03 15:38:45 -04:00
Silversthorn
99693324dc Fix scrolling of sidebar 2022-10-03 18:48:49 +02:00
Andrew
352a3e12e7 Fix minor bugs with uploads import 2022-10-02 15:54:13 -04:00
Andrew
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import'
# Conflicts:
#   app/frontend/templates/server/wizard.html
2022-10-02 19:10:05 +00:00
Andrew
dc218eb9d5 Remove java specific settings from bedrock upload 2022-09-28 18:23:12 -04:00
Andrew
ab344cbff4 Add zip upload to bedrock servers 2022-09-27 22:49:52 -04:00
Andrew
b9bd654e58 Add upload import functionality.
Update gitignore
2022-09-27 22:06:22 -04:00
Andrew
31a8366186 Fix tooltip colors 2022-09-26 21:41:22 -04:00
Andrew
3d82b61007 Add comments to CSS file.
Update ronald theme
2022-09-26 21:34:54 -04:00
Andrew
3eb87209de Fix color issues with dropdown 2022-09-26 21:24:00 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
Andrew
95188a053d Fix navigation colors 2022-09-25 22:36:17 -04:00
Andrew
c7a292a662 Fix notification color 2022-09-25 22:23:37 -04:00
Andrew
baa441d427 Add light. Fix login 2022-09-25 22:18:36 -04:00
Andrew
ca91debea1 Set base.html origin back to default 2022-09-25 17:52:24 -04:00
Andrew
e6121b06a6 Add dark mode. Refactor code to accept themes 2022-09-25 17:52:01 -04:00
Andrew
d7de340807 Initial commit for themes/black 2022-09-25 12:45:22 -04:00
amcmanu3
084cb8b71c Fix scrollable term issue on startup 2022-09-19 20:17:02 -04:00
Zedifus
2b36fbd448 Merge branch 'dev' into tweak/reaction-schedules 2022-09-19 22:50:55 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Zedifus
07941b7c3c Merge branch 'dev' into bug/js-errors 2022-09-19 21:57:43 +01:00
Zedifus
53be81dc08 Merge branch 'dev' into tweak/terminal-scroll 2022-09-19 21:47:52 +01:00
Andrew
9ecf912a98 Make default option be selected option in edit 2022-09-16 13:15:07 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
amcmanu3
17b6ec9fe3 Cleanup JS errors 2022-09-09 13:16:26 -04:00
Andrew
84838aae4d Fix vterm scroll logic when user is on bottom 2022-09-07 18:16:18 -04:00
Andrew
a0d921ffe3 Cleanup virtual term scroll
Add scroll to bottom button when scrolled
2022-09-07 18:02:49 -04:00
Andrew
1a9dd53ebe Remove roles url from href
Fixes trace when clicking "roles config" tab while on roles config page.
2022-09-07 13:48:18 -04:00
amcmanu3
83834286fb Fix creation aesthetic 2022-09-04 18:27:45 -04:00
amcmanu3
e3cf2765f0 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-04 18:01:03 -04:00
amcmanu3
ab2e8cde0f Fix formatting on server creation page. 2022-09-04 18:01:00 -04:00
amcmanu3
76a499f5a4 Fix start server after updates
Fix update notifs
2022-09-04 17:50:08 -04:00
Zedifus
0bce6f432a Merge branch 'dev' into enhancement/metrics-range 2022-09-04 21:25:45 +01:00
amcmanu3
e9c74be057 Add ability to change metrics scale 2022-09-04 16:21:33 -04:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00
amcmanu3
d568b7c664 Fix EULA message for legal reasons
Make EULA message look prettier
2022-09-01 14:18:04 -04:00
amcmanu3
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
amcmanu3
b274f0d3b0 Remove update url from config 2022-08-31 19:36:43 -04:00
Andrew
0f820433f1 Remove log path from config for bedrock 2022-08-31 12:39:52 -04:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Zedifus
b0b04a6495 Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout 2022-08-27 17:50:50 +01:00
Zedifus
1b4777fbab Merge branch 'dev' into feature/pretzel-users-roles-manager 2022-08-27 17:25:49 +01:00
Andrew
9831705677 Fix height on different viewports 2022-08-22 22:39:39 -04:00
Andrew
1e569300fc Add translations 2022-08-22 20:23:09 -04:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
amcmanu3
6ad9863cbf Still kinda broken, but this is cool 2022-08-22 01:15:18 -04:00
amcmanu3
eec9f0fc95 Remove zooming 2022-08-21 21:53:24 -04:00