1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Commit Graph

940 Commits

Author SHA1 Message Date
98777db553 Merge branch 'development' 2018-01-31 09:31:10 -05:00
cda7e21d34 Fixed typo to fix bug 2018-01-31 09:31:03 -05:00
d7899ca243 Merge branch 'development' 2018-01-31 09:17:18 -05:00
ebbc92e0c0 Only assign matches with about number 2018-01-31 09:15:48 -05:00
efaea8f19d Merge branch 'development' 2018-01-31 08:50:02 -05:00
275e65c7a1 When generating a new weight, wipe mats from matches 2018-01-31 08:49:38 -05:00
33338df7ed Merge branch 'development' 2018-01-31 08:00:17 -05:00
9841f5648d Discard ActiveRecord association cache so generating a single weight class of matches works 2018-01-31 07:59:48 -05:00
b764476bef Merge branch 'development' 2018-01-31 07:39:04 -05:00
53598152cf Realigned file and sorted matches by weight and round when assigning bouts 2018-01-31 07:26:15 -05:00
817cb941f7 Merge branch 'development' 2018-01-10 08:01:09 -05:00
6d75d26f3b Copyright current year 2018-01-10 07:32:17 -05:00
ff4cb52541 Upgrade packages upon build for prod 2018-01-09 07:59:49 -05:00
a36a083826 Moved files out of the root of the project to bin and deploy where they belong 2018-01-09 07:58:37 -05:00
05a71e8f05 Accidental swap file 2017-12-18 07:53:32 -05:00
ec1d23f7db Merge branch 'master' of https://github.com/jcwimer/wrestlingApp 2017-12-18 07:52:14 -05:00
d88000f06a Added a stats page for teams 2017-12-18 07:51:38 -05:00
ba05573928 Pretty up wrestler show page 2017-12-14 09:04:12 -05:00
7831bfaf6b Pretty up wrestler show page 2017-12-14 09:03:31 -05:00
03f3b8dcff Break down wrestlers points on the show page 2017-12-13 11:13:40 -05:00
dac040d4f2 Added example format for tournament date 2017-12-13 11:13:40 -05:00
2ed0d94227 Updated to ruby 2.4.2 on travis ci 2017-12-13 11:13:40 -05:00
96d911ad09 Updated to ruby 2.4.2 and rails 5.1.4 2017-12-13 11:13:40 -05:00
181d56f12d Break down wrestlers points on the show page 2017-12-13 11:12:23 -05:00
7fb8e198ea Added example format for tournament date 2017-12-13 09:02:19 -05:00
268647c506 Updated to ruby 2.4.2 on travis ci 2017-12-11 08:02:49 -05:00
8ff2bba87a Updated to ruby 2.4.2 and rails 5.1.4 2017-12-11 07:57:26 -05:00
d22d57c0e0 Merge branch 'development' 2017-11-29 13:58:45 -05:00
e22e3af8eb Tidied up Dockerfiles 2017-11-29 08:29:45 -05:00
dc81df56d2 Merge branch 'development' 2017-11-18 19:38:32 -05:00
0c9af7fcb3 Added stats to wrestler -> show 2017-11-14 07:43:06 -05:00
62faa4f307 Added info about bye points 2017-11-14 07:42:21 -05:00
da37cc9eff Did not want to add .swp files 2017-11-13 08:44:26 -05:00
5cfcfe0448 Added info to match edit (mat -> show) and up_matches pages. 2017-11-13 08:42:16 -05:00
94bb5affa3 Added Gemfile.lock to docker build 2017-11-09 08:53:04 -05:00
4089d37825 Fixed query issue for advancing losing wrestlers in a 'pool to bracket' bracket 2017-11-09 08:13:29 -05:00
611f54f522 Keeping Gemfile.lock for versioning of gems 2017-11-07 12:56:27 -05:00
16d63b52cd Made a test for the swap wrestlers service 2017-09-04 21:53:28 -04:00
e40851d9fc Pool numbers need swapped when wrestlers are swapped 2017-09-02 11:48:23 -04:00
594469f4d8 Gemfile.lock no longer exists in repo 2017-08-29 13:52:26 -04:00
5bebc342a6 Gemfile.lock should not be in source control 2017-08-29 13:03:30 -04:00
e168d0b51d Added functionality for a tournament director to move a wrestler to a pool that has a bye for greater flexibility 2017-08-29 13:02:00 -04:00
f9fb3e4108 Remove intrusive ads 2017-08-12 23:30:00 -04:00
123dc6b332 Using local docker registry for test image 2017-08-12 21:26:16 -04:00
5f31879af8 Remove bad ads 2017-08-11 08:55:17 -04:00
6fb304f5c7 Secret key base and devise key added for dev 2017-08-10 20:43:18 -04:00
c839e2e843 Fixed a eager load bug 2017-06-09 18:00:20 -04:00
0fb2e7009b Updated migrations to support new rails version 2017-06-09 07:22:32 -04:00
89443f770e Updated .travis.yml to db:migrate when deploying 2017-06-08 21:54:33 -04:00
573b3c3e12 Updated ruby version in .travis.yml 2017-06-08 21:51:22 -04:00