Andrew 5adc48c524 Merge branch 'pretzel-bedrock' into 'pretzel-fixes' ... # Conflicts: # app/frontend/templates/server/bedrock_wizard.html # app/frontend/templates/server/wizard.html		2022-02-10 20:57:31 +00:00
..
ajax	changed notify icon - added code to grab remote json from craftycontrol.com for announcements and such - icon turns red if update available	2020-09-22 21:42:41 -04:00
panel	Merge branch 'dev' into 'pretzel-fixes'	2022-02-10 19:32:59 +00:00
public	Remove motd dynamic update as it breaks json loading	2022-01-27 18:19:11 -05:00
server	Merge branch 'pretzel-bedrock' into 'pretzel-fixes'	2022-02-10 20:57:31 +00:00
setup	Add SVG logos and change everything to use them	2021-11-02 17:00:48 +02:00
base.html	Added better navigation.	2022-02-10 00:26:16 +02:00
blank_base.html	Add SVG logos and change everything to use them	2021-11-02 17:00:48 +02:00
blank_page_template.html	Adding Websocket for server details	2022-01-21 23:50:04 +01:00
footer.html	Fix footer	2022-01-08 19:07:50 -05:00
main_menu.html	Merge branch 'lukas-easier-navigation' into 'dev'	2022-02-10 13:42:21 +00:00
notify.html	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
public_base.html	Using Wabsocket for refreshing Status Page	2022-01-19 21:34:59 +01:00