Commit Graph

398 Commits

Author SHA1 Message Date
kevroded
ae81961428 Merge remote-tracking branch 'upstream/master' 2021-01-06 20:47:54 -05:00
kevroded
8ce9bb5e84 Fixes #7 2021-01-06 20:38:39 -05:00
kevroded
ff867b541c Added ability to pull weather information from db for game history 2021-01-06 20:35:37 -05:00
Sakimori
5aa1ae4b7b
Merge pull request #135 from esSteres/indev
forgot about leagues, whoops
2021-01-06 15:23:31 -05:00
Elijah Steres
c931733ad1 forgot about leagues, whoops 2021-01-06 15:20:46 -05:00
Sakimori
af657d3be2
Merge pull request #134 from esSteres/indev
(URGENT) Fix js injection vulnerability
2021-01-06 14:36:01 -05:00
Elijah Steres
eb2c5797cb Fix js injection vulnerability 2021-01-06 14:14:19 -05:00
kevroded
957c11c60d Moved DB update command to limit duplicate entries 2021-01-06 12:24:59 -05:00
Sakimori
9df80e0095
Merge pull request #132 from Sakimori/indev
cleaned up a comment
2021-01-06 02:27:37 -05:00
Sakimori
2c638970de cleaned up a comment 2021-01-06 02:27:04 -05:00
Sakimori
933c642dc4
Merge pull request #131 from Sakimori/indev
1/5/2021 hotfix
2021-01-06 02:00:59 -05:00
kevroded
8044c1cae7 New attempt to fix game history saving multiple times 2021-01-06 01:24:03 -05:00
kevroded
97f125c55e Moved db statement to remove duplicate saves 2021-01-06 01:05:37 -05:00
kevroded
3c93d1e4c8 fixed db error 2021-01-06 00:46:51 -05:00
kevroded
3e8f5c46d3 Fixed cache_history 2021-01-06 00:26:27 -05:00
kevroded
f8b5480cfa debug removed weather info should be getting saved to the DB 2021-01-06 00:19:31 -05:00
kevroded
9a5162a448 Updated debug message 2021-01-06 00:12:46 -05:00
kevroded
8444e5b07a Fixed commented out line 2021-01-06 00:04:14 -05:00
kevroded
bd25fae829 debugging staement added 2021-01-06 00:02:46 -05:00
kevroded
e9abc7befd First try at adding weather to game history command 2021-01-05 23:52:23 -05:00
Kevin Rode
9f6f74f1e9 Updated readme fixes #8 2021-01-05 20:47:22 -05:00
Kevin Rode
6a1ff1d352 Merge branch 'master' of https://github.com/kevroded/matteo-the-prestige 2021-01-05 20:38:19 -05:00
Kevin Rode
120496f66b Readded commands to save game history 2021-01-05 20:38:02 -05:00
Sakimori
aff7c88775 Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-05 17:30:00 -05:00
Sakimori
9b7038990f strip trailing spaces from team name and slogan 2021-01-05 17:28:45 -05:00
Sakimori
d2461cf81b
Create LICENSE.md
added the attribution-noncommercial-sharealike 4.0 international license to simsim
2021-01-05 17:03:48 -05:00
Sakimori
0a1ce24853 Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-05 15:31:57 -05:00
Sakimori
84cb16ab5d added --bestof and --finalsbestof flags to tournament 2021-01-05 15:31:50 -05:00
Sakimori
5eee2f4d0e
Merge pull request #130 from esSteres/indev
missed a merge conflict riv
2021-01-05 15:28:51 -05:00
Elijah Steres
3b1a9d2548 missed a merge conflict riv 2021-01-05 15:25:12 -05:00
Sakimori
55f589dde1 adjusted the mulligan curve 2021-01-05 15:18:18 -05:00
Sakimori
ccd7702db8
Merge pull request #127 from jmaliksi/jm_fix_imports
Fix onomancer import
2021-01-05 14:29:36 -05:00
Sakimori
803f633a9e changed timestamp to uuid strings, adjusted variable names in the_prestige and main_controller 2021-01-05 14:26:54 -05:00
joe
60196929fd erroneous not 2021-01-05 09:15:54 -08:00
joe
56fbe809c7 fix onomancer import with add_pitcher 2021-01-05 09:09:41 -08:00
kevroded
178a414846 Updated base.html 2021-01-05 11:56:41 -05:00
Sakimori
8d01a3cc79
Merge pull request #125 from esSteres/dynamic-grid
Dynamic grid column count
2021-01-05 01:48:29 -05:00
Elijah Steres
bfd7a8065d Merge remote-tracking branch 'upstream/indev' into dynamic-grid 2021-01-05 00:51:23 -05:00
Elijah Steres
4a8285ca9f fixes and tweaks 2021-01-05 00:26:33 -05:00
Sakimori
74a205fe74
Merge pull request #124 from esSteres/indev
fix game page getting squashed on mobile
2021-01-05 00:05:37 -05:00
Eli
b31b19ea05 make grid columns dynamically adjust to screen size 2021-01-04 23:39:24 -05:00
Elijah Steres
e37abb55a1 fix game page getting squashed on mobile 2021-01-04 22:55:53 -05:00
Kevin Rode
4cf5e48910 Removed weather counts as they are not used 2021-01-04 22:51:22 -05:00
Kevin Rode
6ebea65a93 Reverting fuzzy select 2021-01-04 22:39:58 -05:00
Kevin Rode
14e4b5db6f Fixed debug messages? 2021-01-04 22:32:41 -05:00
Kevin Rode
ad85e92511 debug 2021-01-04 22:31:12 -05:00
Kevin Rode
c12a167795 () 2021-01-04 22:30:24 -05:00
Kevin Rode
aa5b4b0c14 Needs more debug 2021-01-04 22:29:45 -05:00
Kevin Rode
b7853200da more debug 2021-01-04 22:25:13 -05:00
Kevin Rode
d669c90de3 debugging 2021-01-04 22:23:26 -05:00