ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-27 04:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
1384 commits 19 branches 0 tags 55 MiB
Commit graph

182 commits

Author SHA1 Message Date
Ari Timonen
a6eb8bc7b1 More work on feature tests, remove readings 2020-03-16 04:36:06 +02:00
Ari Timonen
661eb61717 Update routes and rake 2020-03-16 00:58:22 +02:00
Ari Timonen
322001f8d3 Rails 4 fixes 
Update to ruby 2.3.8
Update gems
Fix tests
 2020-03-15 20:31:46 +02:00
Ari Timonen
b35ba51910 More test fixes for rails 4 2020-03-15 09:53:52 +02:00
Ari Timonen
88721b28df Fixes for development 
Temporary fix for puma.rb
Rename .env.dev
Fix more merge conflicts

Dev env runs and tests run (with fails)
 2020-03-14 21:43:19 +02:00
Ari Timonen
2c71b1147d Merge rails-4 to rails4 2020-03-14 21:10:24 +02:00
Ari Timonen
4e3009b5c2 Rails 4 updates 2020-03-09 00:07:12 +02:00
Ari Timonen
a511fb526e Fix merge conflicts 2020-03-08 22:58:52 +02:00
Absurdon
db9d4c1564
Added Contributor Group Treatment 
* Logrotation for production
* added contributors class method to Group
* added contributor? method to User
* added contributor flag to User-API
* added Contributor-Tab to staff-page
 2019-11-12 23:27:54 +01:00
Absurdon
7ec019fda6
Fixing Password Rest 
* Reverting 'forgot' view back to a form
* Adding smtp configuration for production
* Adding postfix image to docker-compose
 2019-10-14 22:26:43 +02:00
Ari Timonen
11fcea3259 Add docker dev version 
Add env and docker files for development

Fix some random things related to rails upgrade
 2019-09-24 22:55:34 +03:00
Ari Timonen
0b53968d3d Temporary commit 2019-06-01 13:56:09 +03:00
Ari Timonen
07c53b7469 Fix mysql2 schema issue 2018-11-22 19:46:46 -05:00
Ari Timonen
8ccef9e224 Update for rails 4 
Add matches to routes
Update mysql2 gem

Remove caldner for moment
 2018-11-22 19:46:41 -05:00
Absurdon
dec054eed8 removed shoutmsg history 
removed compmod council group from staff page
fixed some errors with missing database entries
 2018-09-21 17:30:43 +02:00
Ari Timonen
22fc8cb50b Update to a working version 
- Use assets workaround to work around the volume issue with docker
- Add assets to gitignore
- Fix dalli hostname
- Update docker-compose to new paths for volumes
- Fix MariaDB issue with optimization opts
 2018-04-25 16:41:22 +00:00
Ari Timonen
e3275b34ce Update docker version 
Update fig.yml to work
Update puma to not daemonize to work
Update dockerfile too

This version should work now.
 2018-04-15 11:17:59 +00:00
Ari Timonen
3984ad2442 Fix docker image 
Fix bunch of things with docker and add entry.sh
 2018-04-14 13:02:58 +00:00
Ari Timonen
4a8bd8ee7d Update ensl.org for docker version 
Create docker version
- Remove rubyracer, use nodejs
- Add Makefile and fig.yml examples
- Update to v2 circle.yml sample
- Create Dockerfile
- Do not use nested folders in tmp for puma
 2018-04-10 01:08:38 +00:00
Absurdon
826614a92c Fixed route to custom_urls#administrate 2017-11-12 18:02:53 +01:00
Absurdon
8e58a30285 Renaming because old unused stuff is getting in the way 2017-11-12 18:02:53 +01:00
Absurdon
6b334ced39 Create stubs for controller and model 2017-11-12 18:02:53 +01:00
Absurdon
62bc78274a Creating view to show confirmed matches, fixing bugs in permission logic and making proposal status updates ajax requests 2017-10-07 12:28:06 +02:00
Absurdon
fa27e9fae4 Merge branch 'master' into MatchScheduler 2017-08-30 20:14:10 +02:00
Absurdon
a43914e815 Migrated countries to use country_select gem and reworked how flags get displayed 2017-08-23 22:45:09 +02:00
Absurdon
9c9ae32a9c Merge branch 'master' into MatchScheduler 2017-07-07 16:05:02 +02:00
Absurdon
04f2fd77ff Added view for creating proposals and added some controller functionality 2017-05-11 22:26:18 +02:00
Absurdon
160fccd118 Added model and controller stub 2017-05-01 16:57:32 +02:00
Absurdon
624da53bb6 Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Absurdon
50f74810ec Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Ari Timonen
04b2638ebd Change capistrano version 2017-02-12 21:39:54 +01:00
Ari Timonen
e32dd60032 Change capistrano version 2017-02-12 21:39:54 +01:00
Chris Blanchard
24c825e2c9 Add teams api 2016-04-17 00:05:18 +01:00
Chris Blanchard
970f5dd9cf Add teams api 2016-04-17 00:05:18 +01:00
Prommah
c68ee2efe5 Bug fixes, improved consistency & cleanliness 2015-11-08 22:59:22 +00:00
Prommah
d64d3051dc Bug fixes, improved consistency & cleanliness 2015-11-08 22:59:22 +00:00
Prommah
099d1eb7dd Fix hound rubocop rules (hopefully) 2015-11-05 23:32:22 +00:00
Prommah
99a45666b2 Fix hound rubocop rules (hopefully) 2015-11-05 23:32:22 +00:00
Prommah
2fa7c03a51 Removed unpopular non-default style rule 2015-10-29 06:43:02 +00:00
Prommah
5e1b270787 Removed unpopular non-default style rule 2015-10-29 06:43:02 +00:00
Prommah
87701f10eb Update hound config 2015-10-28 02:51:49 +00:00
Prommah
9371d1df13 Update hound config 2015-10-28 02:51:49 +00:00
Prommah
76492ff072 Add hound & ruby style config 2015-09-24 15:04:45 +01:00
Prommah
1a582daf0c Add hound & ruby style config 2015-09-24 15:04:45 +01:00
Luke Barratt
a8cdbb932e Replace crazy NewRelic config template with a simple one 2015-08-31 16:21:16 +01:00
Luke Barratt
fbf82b6948 Replace crazy NewRelic config template with a simple one 2015-08-31 16:21:16 +01:00
Luke Barratt
eaf20e298f Removed legacy NewRelic initializer since we're no longer using Unicorn 2015-08-31 16:21:15 +01:00
Luke Barratt
b7ff6b037b Removed legacy NewRelic initializer since we're no longer using Unicorn 2015-08-31 16:21:15 +01:00
Luke Barratt
865a0cae5a Restore POST routes to /users/login and /users/logout 2015-08-23 13:24:19 +01:00
Chris Blanchard
a2ebca64f4 Share production ensl session store with subdomains 2015-08-18 11:05:52 +01:00
Chris Blanchard
007c74a6fb Share production ensl session store with subdomains 2015-08-18 11:05:52 +01:00
Luke Barratt
e6c2ebcbc3 Added .eager_load config variable to each environment respectively 2015-08-15 23:30:14 +01:00
Luke Barratt
320fc67e4c Removes outdated acts_as_versioned plugin in favour of an updated version extracted from Redmine 2015-08-15 20:28:21 +01:00
Luke Barratt
e2c8472023 Replace instances of #match with #get in application routes 2015-08-15 20:26:42 +01:00
Luke Barratt
01d0a5d80a Merge pull request #41 from ENSL/task/upgrade-ruby 
Task/upgrade ruby
 2015-08-15 19:35:49 +01:00
Luke Barratt
4d07d8ddc6 Merge pull request #41 from ENSL/task/upgrade-ruby 
Task/upgrade ruby
 2015-08-15 19:35:49 +01:00
Chris Blanchard
8544e46380 Set new session store name and domain for staging 2015-08-15 18:42:44 +01:00
Chris Blanchard
c1430343a9 Set new session store name and domain for staging 2015-08-15 18:42:44 +01:00
Luke Barratt
96167b55e4 Merge branch 'develop' into task/upgrade-ruby 2015-08-15 17:32:35 +01:00
Luke Barratt
3020c98f57 Merge branch 'develop' into task/upgrade-ruby 2015-08-15 17:32:35 +01:00
Luke Barratt
04c66e1bea Upgrade ruby to 2.2.2. Bump rails to 3.2.22 
- Upgrade RSpec to 3.3
- Auto formatted existing specs
- Fixes broken test assertions
- Update capistrano rbenv_ruby to target 2.2.2
- Added test-unit as test dependency as it has been removed form ruby 2.2
 2015-08-15 12:50:28 +01:00
Luke Barratt
944c55a869 Upgrade ruby to 2.2.2. Bump rails to 3.2.22 
- Upgrade RSpec to 3.3
- Auto formatted existing specs
- Fixes broken test assertions
- Update capistrano rbenv_ruby to target 2.2.2
- Added test-unit as test dependency as it has been removed form ruby 2.2
 2015-08-15 12:50:28 +01:00
Chris Blanchard
b87a77405e Revert session cookie changes in production 2015-08-15 11:48:55 +01:00
Chris Blanchard
159388b060 Revert session cookie changes in production 2015-08-15 11:48:55 +01:00
Chris Blanchard
43514b358e Enable session store across gather domains 2015-08-12 01:54:41 +01:00
Chris Blanchard
c16903213d Enable session store across gather domains 2015-08-12 01:54:41 +01:00
Chris Blanchard
3ec284b925 Added maps api 2015-08-01 16:34:01 +01:00
Chris Blanchard
cdfea24a87 Added maps api 2015-08-01 16:34:01 +01:00
Chris Blanchard
b0db658ef6 Added server api 2015-08-01 16:20:49 +01:00
Chris Blanchard
9736ca4d10 Added server api 2015-08-01 16:20:49 +01:00
Chris Blanchard
ddf55aae4e Bring back user plugin 2015-06-15 23:16:59 +01:00
Chris Blanchard
a42547d227 Bring back user plugin 2015-06-15 23:16:59 +01:00
simplefl
0ee7bd5e1b Up wait_timeout to 90. 2015-06-11 17:18:51 +02:00
simplefl
ea232e86ec Up wait_timeout to 90. 2015-06-11 17:18:51 +02:00
simplefl
1c5513babf Add wait_timeout and reconnect to database.ym. 2015-05-26 19:06:40 +02:00
simplefl
e182bfda75 Add wait_timeout and reconnect to database.ym. 2015-05-26 19:06:40 +02:00
Christopher Blanchard
153d081843 Remove plugins all hush like 2015-05-22 14:17:28 +01:00
Christopher Blanchard
cd2c421f0f Remove plugins all hush like 2015-05-22 14:17:28 +01:00
Luke Barratt
faefc55457 Remove travis config. Added CircleCI config. 2015-04-12 10:42:34 +01:00
Luke Barratt
e364deaa52 Remove travis config. Added CircleCI config. 2015-04-12 10:42:34 +01:00
Luke Barratt
7ec4af9d1b Update rbenv_ruby to 2.1.5 for deployments. Bump puma webserver version. 2015-04-07 21:19:25 +01:00
Luke Barratt
7f7fdd38d3 Update rbenv_ruby to 2.1.5 for deployments. Bump puma webserver version. 2015-04-07 21:19:25 +01:00
jamal
d6e0a5d1d1 Revert "Fix some logic errors with captains" 
Revert "Change Gather style to volunteer captains"

This reverts commits fb7d361, d8134ca, and ebd60d1.
 2014-12-08 09:35:40 -05:00
jamal
cf0b0461b6 Revert "Fix some logic errors with captains" 
Revert "Change Gather style to volunteer captains"

This reverts commits fb7d361, d8134ca, and ebd60d1.
 2014-12-08 09:35:40 -05:00
jamal
4c7041e4b3 Change Gather style to volunteer captains 
This will change the gather format to allow for players to volunteer to be captain / commander. The gather will not change from the running state until 2 commanders have volunteered. Once commanders have volunteered the gather will switch to the picking state. The voting state is no longer used.

Also, added a new sound alert that will be played when the gather is full but doesn't have 2 captains. This alert will loop every 10 seconds unless you're the commander. And changed the music to play once the gather switches to the picking state and only if the player doesn't have the gather page on focus.
 2014-10-11 15:50:06 -04:00
jamal
ebd60d19eb Change Gather style to volunteer captains 
This will change the gather format to allow for players to volunteer to be captain / commander. The gather will not change from the running state until 2 commanders have volunteered. Once commanders have volunteered the gather will switch to the picking state. The voting state is no longer used.

Also, added a new sound alert that will be played when the gather is full but doesn't have 2 captains. This alert will loop every 10 seconds unless you're the commander. And changed the music to play once the gather switches to the picking state and only if the player doesn't have the gather page on focus.
 2014-10-11 15:50:06 -04:00
jamal
d6b501ac46 Add state to gatherers and track when a gatherer has left or is away 2014-10-10 20:50:17 -04:00
Luke Barratt
7804545c89 Bump Ruby and puma versions 2014-09-27 19:49:31 +01:00
Luke Barratt
47c2bc4006 Added steam profile lookup API endpoint 2014-08-28 23:04:18 +01:00
Luke Barratt
8c4dd7b5e3 Bump ruby to 2.1.2 
See:

http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
 2014-08-28 23:04:17 +01:00
Luke Barratt
4b3fc78d49 Properly compile assets 2014-05-30 21:54:01 +01:00
Luke Barratt
180ab8a408 Prefer 1.9 hash syntax 
Remove unused log entries?
 2014-05-19 21:44:47 +01:00
Room5-Joey
60404adf63 Can now join teams from the teams pages individually. If you already have a request active, it will remove that request and replace it with a new one (with a confirmation). I left the Agenda way of joining/cancelling join of teams. 2014-05-19 20:52:26 +01:00
Luke Barratt
ed71ad5344 Fixes updating contests 2014-05-19 20:51:32 +01:00
Luke Barratt
c64df4e70d Merge in alternate CSS 2014-05-16 22:10:24 +01:00
Luke Barratt
9edc514275 Fixes gather captains not able to pick players 
Added missing gather translation
Cleanup JS
 2014-05-10 14:52:45 +01:00
Ari Timonen
d91a2eae52 Add match admin page and casting 2014-05-10 11:52:00 +03:00
Luke Barratt
faa895b3f0 Bump to Rails 3.2.18 
Reduce aggressive topic reply/view count caching
Improve shout box spacing
Pass broken tests
 2014-05-10 02:26:18 +01:00
Luke Barratt
dd85659f1d Merge branch 'refs/heads/feature-redesign-rantology' into develop 
Conflicts:
	app/assets/stylesheets/sass/index.sass
	spec/spec_helper.rb
 2014-05-09 23:17:55 +01:00
Luke Barratt
616c96c45b Added base CSS for rantology's design 2014-05-03 18:50:45 +01:00