1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-30 19:22:21 +00:00
Commit Graph

645 Commits

Author SHA1 Message Date
2c44bc9845 Trying to get routes working but they are not working at the moment. Also moved the tournaments search and table to its own page 2016-03-22 11:29:32 +00:00
97ec2971a5 Added memcached to production docker compose, also added worker command for test compose 2016-03-10 12:47:46 +00:00
dc1c955485 Workers have a different command 2016-03-10 12:46:03 +00:00
4ae5e66b66 Fixed dockerfiles for prod and dev with new frontend 2016-03-09 09:09:18 -05:00
c8a09956f4 Revert "Using a more lightweight image and using rvm for ruby"
This reverts commit 621813a015.

I could not get the lightweight docker image working correctly with rvm. I will most likely switch back to this image in the future when I have more time to work on it.
2016-03-03 09:56:24 -05:00
621813a015 Using a more lightweight image and using rvm for ruby 2016-03-03 13:55:27 +00:00
089f0e3162 Set up frontend on docker images 2016-03-03 13:39:56 +00:00
85f9346001 Removed console.log on frontend tournamentsController, also fixed frontend syntax errors in tournamentsController and tournamentsService 2016-03-02 15:54:38 +00:00
9bd36d2cb0 Added a search to both api and frontend 2016-03-02 14:08:14 +00:00
817e1fb0c1 Moved api call to a service 2016-03-02 13:34:41 +00:00
459585fce2 Fixed navbar with rails navbar changes 2016-03-01 16:22:34 +00:00
691d417322 Merge branch 'linemanjs' into development 2016-03-01 16:15:45 +00:00
c03402bcdb Added a mock layout and an api call for angular 2016-03-01 16:15:19 +00:00
db2e9a1c65 making navbar mobile friendly 2016-02-23 14:12:26 -05:00
305d45960b Changed tmux script to better suite needs 2016-02-18 12:54:06 -05:00
4a90165514 Added bootstrap and angularjs 2016-02-18 15:13:33 +00:00
3504c54ed4 Added a script to run tests 2016-02-18 08:24:24 -05:00
33529cb9fe Added description and author 2016-02-18 12:51:22 +00:00
fae5b310a2 Changed port lineman runs on 2016-02-18 12:51:00 +00:00
8c08b5a47f Added memcahced to test deploy 2016-02-18 07:49:49 -05:00
2d3aa1b760 Set up api for development 2016-02-10 17:46:16 +00:00
dfa0972747 Added linemanjs as frontend 2016-02-10 16:33:44 +00:00
4685173548 Removed url for tournaments api 2016-02-10 15:20:52 +00:00
643012ae1d Change to ruby 2.3.0 on travis ci 2016-02-10 15:17:32 +00:00
e215717914 Start of api 2016-02-10 15:16:58 +00:00
731131073f Specified ruby 2.3.0 2016-02-10 14:10:42 +00:00
1f08d1a823 Assign next mat match before submitting delayed job 2016-02-04 15:32:38 +00:00
57c4191562 Containers do not need removed just killed 2016-02-03 19:02:30 +00:00
42a5215d34 Separate killing containers and removing them 2016-02-03 18:42:53 +00:00
fcda6095c8 Kill and remove containers gracefully without error when zero are running 2016-02-03 18:26:47 +00:00
6d6fddea7e Fixed bug on bracket page 2016-01-30 03:34:31 +00:00
ac28af84a5 Fixed bug in single pool placement points and wrote tests 2016-01-29 19:22:05 +00:00
14058e6a6c Old tests now pass with single pool placement points. Still need to write tests for single pool placement points 2016-01-29 13:42:28 +00:00
03a8653229 Trying to kill container without ansible failing when zero containers are running 2016-01-29 13:09:31 +00:00
29dd01cb9c Pull latest image before running 2016-01-29 13:06:49 +00:00
3ae5727f09 Set hostname for production docker containers 2016-01-28 16:37:04 +00:00
1b9151a888 First shot at setting placement points for a single pool 2016-01-28 16:36:13 +00:00
a8b96c96e8 Swap page is now working and also moved swaping logic from tournament model to its own class 2016-01-27 14:13:49 +00:00
96c7cd446c Fixed tests now that higher seeded guys wrestle in the last pool round 2016-01-26 14:00:48 +00:00
997d547ed2 Now that swapping works, make sure the higher seeded guys wrestle last in the pools 2016-01-26 14:00:09 +00:00
765d45194c Had to specify swapping pool matches because guys were being added to bracket matches and I could not figure out why 2016-01-26 13:59:37 +00:00
ada3434e55 Fixed bug to correctly calculate championship wins and conso wins 2016-01-25 16:02:33 +00:00
c46f895870 Swapping wrestlers works correctly now. 2016-01-25 15:33:46 +00:00
dcd8ab3dc0 Removed uneeded method in tournament model 2016-01-25 13:02:16 +00:00
01b9476ba7 Switched back to original way I swapped wrestlers 2016-01-25 12:59:38 +00:00
75efa73777 Added shell views and routes to swap wrestlers bracket positions
Still need to set permssions on swap controller method
2016-01-25 12:53:32 +00:00
0275b48499 Fixed issue with zero seeded kids 2016-01-25 01:18:02 +00:00
f97557ec23 Fixed the way I swap wrestlers 2016-01-25 01:11:35 +00:00
a9463d0f0c Revert "idk"
This reverts commit bb8f498ca0.
2016-01-23 14:41:42 +00:00
bb8f498ca0 idk 2016-01-23 14:39:21 +00:00