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

717 Commits

Author SHA1 Message Date
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
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
a3c768b0bb Updated README to reflect new versions of rails and ruby 2017-06-08 21:47:47 -04:00
98e63a2ff0 Upgraded to Rails 5.1.1 2017-06-08 21:45:36 -04:00
f409918f5b Separate apt-get clean and apt-get update on multiple lines 2017-06-02 21:42:30 -04:00
63595954a1 Needed to add a js library to dev and prod docker images 2017-05-31 12:43:31 -04:00
b37004cbbf Removed frontend and updated production to use puma instead of pasenger 2017-05-31 09:40:31 -04:00
3f72a912b6 Wrestler pool number is now saved in db. Pool number generation moved to it's own class. 2017-03-02 18:11:21 +00:00
889c2114a4 Merge branch 'development'
Deploying visual changes for brackets. Also deploying cache fixes.
2017-02-02 19:07:33 +00:00
8fa529dc5f Condensed the bracket pages 2017-02-01 19:37:58 +00:00
9ac3b3baa9 All brackets page gives 1 bracket per page 2017-02-01 13:47:48 +00:00
86bb0b6f3c Fixed cache names so multiple tournaments cache at once 2017-01-31 14:01:09 +00:00
b5d07e103e Swap wrestlers moved from edit wrestler to the bracket page 2017-01-31 13:43:56 +00:00
196797566c Merge branch 'development' 2017-01-19 13:13:07 +00:00
bb30b0f916 Fixed heroku api key for travis 2017-01-19 13:12:13 +00:00
eccc523698 Merge branch 'development' 2017-01-19 00:42:13 -05:00
96dc5407da Fixed glitch in pool byes receiving 2 points when you have at least 1 pool
win. Poolrounds was not returning what I was expecting.
2017-01-19 00:41:34 -05:00
3c5838c827 Merge branch 'development' 2017-01-18 09:56:32 -05:00
e77b555069 A BYE gives 2 points in a pool of you win one pool match. Now have two tests failing with regard to tie breakers. Most likely poorley written tests 2017-01-18 14:55:11 +00:00
aeb6011340 apt-get clean before update to fix deployment error 2017-01-18 14:54:05 +00:00
11d0939fa5 Merge pull request #6 from jcwimer/development
Development Merge
2017-01-18 09:23:26 -05:00
d7c82a8d71 Fixed bug on wrestler form to allow a tournament director to move a wrestler to another school 2017-01-18 13:53:17 +00:00
b7775172a3 Updated active record and ruby version 2017-01-17 03:32:38 +00:00
c16ec26ecb Re-added source code to the dev docker image for jenkins to use 2017-01-17 03:30:20 +00:00
67c64e94d1 Fixed dev dockerfile to start up quicker by not adding the rails code. This code gets mounted instead with rails-dev.sh. Added git logs and node_modules folder to dockerignore. Added node_modules folder to gitignore. 2016-12-08 13:40:05 -05:00