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

140 Commits

Author SHA1 Message Date
5c14165d6f Updated procfile for puma 2015-03-24 14:40:20 +00:00
458c0a8723 poolbracket.rb updated for different brackets 2015-03-24 14:21:18 +00:00
c1081ef64a Generate blank matchups for pool brackets 2015-03-23 19:14:58 +00:00
b00d11a222 Merge branch 'master' of heroku.com:wrestlingapp 2015-03-23 18:20:02 +00:00
27883597ca Set up blank bracket matches for fourPools 2015-03-23 18:17:06 +00:00
20f9b7f016 Cleaned up a little bit of code 2015-03-23 11:59:56 +00:00
b3b4fdb6e5 Revert "Moved generateMatches to tournament. Trying to reduce queries and speed"
This reverts commit 0e5dabac8a.
2015-03-17 09:34:43 -04:00
662a1ad498 Revert "Still trying to generate matches from tournament."
This reverts commit e3a1323d39.
2015-03-17 09:34:36 -04:00
e3a1323d39 Still trying to generate matches from tournament. 2015-03-17 09:32:11 -04:00
0e5dabac8a Moved generateMatches to tournament. Trying to reduce queries and speed
up page load.
2015-03-17 09:26:30 -04:00
c86f678fd1 Moved poolNumber generation to weight. 2015-03-17 09:06:21 -04:00
d6a9abffac Update seeds on one page. 2015-03-16 15:06:45 -04:00
8d6fab3428 Trying to get two pool seeds corrected 2015-03-16 12:47:55 -04:00
83703e58bf Two pool separate seeds better 2015-03-16 12:43:27 -04:00
4413c81100 Two pools view needed five rounds 2015-03-16 12:39:27 -04:00
6452aee07a Removed delayed job and generate matches 2015-03-16 09:13:12 -04:00
2843760779 Create bracket views with upcomingMatches 2015-03-16 08:35:56 -04:00
7b9422fd6c Filter wrestlers per pool for matchups. 2015-03-16 08:13:41 -04:00
05c340eb94 Reducing queries for upcoming matches 2015-03-16 08:06:08 -04:00
e8dd332bbc Add boutNumber to upcomgingMatches 2015-03-12 15:18:06 -04:00
dc9639cf1c Calculate matchups for pools. This breaks generating matches. 2015-03-12 15:03:38 -04:00
d68cebc6e4 Compiled assets before deploy 2015-02-11 11:24:15 -05:00
4d8a58a36a Still working on dataTables for heroku 2015-02-11 11:20:42 -05:00
56d2778624 Rearranging application.css 2015-02-11 11:19:06 -05:00
2b52295a0e Changed depricated setting 2015-02-11 11:14:43 -05:00
984222b9d7 Added ruby version to gemfile 2015-02-11 11:14:32 -05:00
c7ea29f2e3 Re-arranging requires in application.js 2015-02-11 11:11:29 -05:00
2d053500ed Still trying to get dataTables working in production 2015-02-11 11:03:59 -05:00
750071627e Trying to get dataTables working in Heroku 2015-02-11 11:00:05 -05:00
fbe6b8cd78 Updated Gemfile.lock 2015-02-11 10:51:43 -05:00
bdec6c0463 Added dataTables for matches and tournaments. 2015-02-11 10:50:25 -05:00
f32b91def7 Change weight.bracket_type to weight.pool_bracket_type and added
twoPoolToFinal for 9 and 10 man weights.
2015-02-09 12:35:25 -05:00
2fe11495c6 Reversed match order for round robin to hopefully move bigger matchups to
later rounds in a bigger pool.
2015-02-09 12:32:50 -05:00
2e7e34125b Updated match generation view, created a bracket_type for weight, and
add DQ as a win type.
2015-02-09 12:31:14 -05:00
399318c6c0 Needed for heroku 2015-02-09 11:04:22 -05:00
aca4d9adf4 Added generating matches as delayed job 2015-02-09 11:02:13 -05:00
3b93c337c7 Fixed delayed job 2015-02-09 11:02:00 -05:00
e09ec3356b Configured delayed_job for rails 4.2.0 2015-02-09 10:35:01 -05:00
66c6840716 Updated to rails 4.2.0 2015-02-09 10:34:12 -05:00
7f692cc925 Delayed job gem installed 2015-02-09 10:32:59 -05:00
b7122fda8b Assigned four pools correctly 2015-02-09 10:26:56 -05:00
d52d462d77 reverse match order for pool 2015-02-07 00:24:10 +00:00
a96a602586 in two pool moved 4 seed to pool 1 and 3 seed to pool 2 2015-02-07 00:05:02 +00:00
eba979740c fixed generation sort 2015-02-06 23:29:00 +00:00
cba5d0a96d removed wrestlers array convert on pool generation 2015-02-06 22:52:58 +00:00
8c7c1abc99 sorting before generating 2015-02-06 22:48:26 +00:00
e7113af9a2 Added round 4 in twoPool 2015-02-06 15:00:41 -05:00
6dd136d0ee Sort pool views by seed 2015-02-06 14:58:06 -05:00
23bef4a2b5 Removed word result from fourPools. 2015-02-06 14:53:46 -05:00
5ca2a7c7ab Added bracket for two pools 2015-02-06 13:39:51 -05:00