Andrew 0ab8f11a60 Merge branch 'dev' into 'pretzel' ... # Conflicts: # app/classes/shared/server.py # app/classes/web/panel_handler.py # main.py		2021-08-18 16:34:41 +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'	2021-08-18 16:34:41 +00:00
public	One monster truck commit for	2021-03-26 15:57:50 +02:00
server	Fix "Server wizard has multiple elements with same ids"	2021-04-17 23:24:34 +03:00
setup	Removed execute bit on a few files	2020-12-20 11:40:25 -05:00
base.html	Merge branch 'dev' into 'pretzel'	2021-08-18 16:34:41 +00:00
blank_base.html	scheduler, version change, database work, controller init servers, etc etc	2020-08-16 22:47:53 -04:00
blank_page_template.html	Worked on dashboard - made a blank page template - started credits page	2020-08-27 23:21:55 -04:00
footer.html	One monster truck commit for	2021-03-26 15:57:50 +02:00
main_menu.html	One monster truck commit for	2021-03-26 15:57:50 +02:00
notify.html	Make HTTP handler functions not return anything else than None to remove an error in the log. Also make users not log out when visiting a page on the public handler	2021-07-30 19:20:01 +03:00