Commit Graph

14 Commits

Author SHA1 Message Date
abdab2d30b split gamecard into its own app, add models to teamsnap for custom fields (images) 2022-06-09 07:46:53 -05:00
ff341b3e72 Merge branch 'v2' into gamecard 2022-06-08 14:17:16 -05:00
4477c7f534 Merge branch 'v2' into gamecard
# Conflicts:
#	benchcoach/static/css/gamecard.css
#	benchcoach/static/fonts/dinpro/dinpro.css
#	benchcoach/static/fonts/m+1m/m+1m.css
#	benchcoach/static/fonts/m+1m/mplus-1m-bold-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-light-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-medium-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-regular-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-thin-webfont.woff
#	benchcoach/static/fonts/refrigerator/refigerator.css
#	benchcoach/static/fonts/vera/Vera-Bold-Italic-webfont.woff
#	benchcoach/static/fonts/vera/Vera-Bold-webfont.woff
#	benchcoach/static/fonts/vera/Vera-Italic-webfont.woff
#	benchcoach/static/fonts/vera/Vera-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-Bold-Italic-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-Bold-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-Italic-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-webfont.woff
#	benchcoach/static/fonts/vera/bitstreamvera.css
#	benchcoach/static/fonts/verdana/VerdanaPro-Black.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-BlackItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Bold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-BoldItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBlack.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBlackItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBoldItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondLight.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondLightItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondRegular.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondSemiBold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondSemiBoldItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Italic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Light.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-LightItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Regular.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-SemiBold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-SemiBoldItalic.ttf
#	benchcoach/static/fonts/verdana/verdanapro.css
#	benchcoachproject/static/css/base.css
#	teamsnap/templates/lineup/gamecard.html
#	teamsnap/urls.py
#	teamsnap/views.py
2022-06-07 18:31:38 -05:00
9b1efdb8eb gamecard v0.1 2022-06-07 18:20:25 -05:00
42d5c452e7 cleaned up some lineup export items 2022-06-07 11:09:20 -05:00
cd503f639c add edit_lineup dashboard 2022-06-02 14:42:11 -05:00
598ebd6910 add schedule, view_event 2022-06-02 10:33:34 -05:00
e1d47f345f initial commit 2022-06-01 15:30:52 -05:00
95697ef4fe consolidated objects into one benchcoach app
created benchcoachproject app to contain all the settings and stuff
some other changes that got grouped with this commit is the adding the ApiObject to the TeamSnap object model
2021-12-21 17:18:04 -06:00
8d2cba39f7 change to use icons 2021-12-10 16:08:43 -06:00
e6ec57c47f Merge branch 'web_layout_improvements' into dev
# Conflicts:
#	benchcoach/static/css/base.css
#	lineups/templates/lineups/lineup.html
#	templates/base.html
2021-12-10 11:19:35 -06:00
ce0169f1f6 reorganized static files folder
added folders for js and css files, added bootstrap files to static
removed requirement for bootstrap python package (bootstrap now in static)
2021-12-10 08:56:00 -06:00
2f620eb417 blank out the base.css 2021-12-10 08:51:59 -06:00
d6220fee57 reorganized static files folder
added folders for js and css files, added bootstrap files to static
2021-12-09 07:08:43 -06:00