Commit Graph

399 Commits

Author SHA1 Message Date
Elijah Steres
486ba1f200 it works! (feature parity coming soon™️) 2021-01-07 03:10:53 -05:00
Sakimori
5d7d28445d
Merge pull request #113 from jmaliksi/jm_the_draft_1
merging draft feature into indev; want some more testing but looks *very* good
2021-01-06 21:01:41 -05:00
joe
97546d7be5 erroneous merge 2021-01-06 17:45:39 -08:00
joe
c15f500058 Final tweaks 2021-01-06 17:42:33 -08:00
joe
c65d81a5e6 fix help text 2021-01-06 17:42:33 -08:00
joe
b76c7de8bc text tweaks 2021-01-06 17:42:33 -08:00
joe
b17d3a3042 pitcher fix 2021-01-06 17:42:33 -08:00
joe
ba70ac4f31 some fixes 2021-01-06 17:42:33 -08:00
joe
56a1b06d28 rebase latest master 2021-01-06 17:42:33 -08:00
joe
5bc2c520ea discord commands 2021-01-06 17:41:52 -08:00
joe
996d35ec06 more whitepace handling 2021-01-06 17:41:52 -08:00
joe
e22a1b3345 filter bookmark out of teams 2021-01-06 17:41:52 -08:00
joe
2718f79c19 Draft controller class 2021-01-06 17:41:52 -08:00
Sakimori
e733059ac1
Merge pull request #137 from Sakimori/master
bring indev into line with master re: security patch
2021-01-06 20:00:28 -05:00
Sakimori
e4cf9f584e
Merge pull request #133 from xSke/resilience-fixes
Resilience fixes
2021-01-06 19:58:18 -05:00
Sakimori
f60da215e3
added new supporter 2021-01-06 19:57:53 -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
Elijah Steres
1f15811170 add react 2021-01-06 14:05:58 -05:00
Astrid
1d3ac175e3 Add WAL files to .gitignore 2021-01-06 12:04:44 +01:00
Astrid
e44ce70a1c Use sqlite3 write-ahead log 2021-01-06 12:03:52 +01:00
Astrid
47b5788a09 Store bot data in a data/ directory 2021-01-06 11:53:51 +01: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
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
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
Sakimori
d331338d93 stopped games printing end-card 1 update too soon 2021-01-04 20:35:59 -05:00
Sakimori
ebaef8828c
Merge pull request #123 from Sakimori/indev
fixed random game end cards for real this time (probably)
2021-01-04 20:26:25 -05:00
Sakimori
6235564622 fixed random game end cards for real this time (probably) 2021-01-04 20:23:32 -05:00
Sakimori
6eec667370
Merge pull request #120 from Sakimori/indev
patch to fix game endcards
2021-01-04 19:56:24 -05:00
Sakimori
759f274efc Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-04 19:42:51 -05:00