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
1285 commits 19 branches 0 tags 55 MiB
Commit graph

1285 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jiriki
9a2ce76628
Merge pull request #122 from tweakign/lamefix 
Fix NS1 gather issues.
 2018-11-25 22:12:45 +00:00
Jiriki
b67c18dd90
Merge branch 'master' into lamefix 2018-11-24 23:44:05 +00: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
b
ee9ec74b1d Merge branch 'master' into lamefix 2018-11-15 21:21:12 +01:00
b
f6ca786c0e Update app/models/gather.rb 2018-11-15 21:16:04 +01:00
b
d5aef89bb0 add gathermod to gatherpage permissions 2018-11-15 20:59:36 +01:00
b
61e1826959 removed looping gather music, turned it down 2018-11-15 20:01:53 +01:00
adsfgg
f5ce390f97 Updated the discord link. 
The old discord link had expired, replaced with a new link.
 2018-09-23 21:02:08 +02: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
Absurdon
f695db4bb1 Fix updating of custom urls 2018-05-03 19:26:18 +02:00
Ari Timonen
a6944cb23c Merge branch 'docker_version3' 2018-04-25 16:43:28 +00: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
5096be9ff3 Fix Dockerfile 
Add entry.sh
 2018-04-23 21:57:01 +00:00
Ari Timonen
6b2f644352 Update docker version 
With docker-compose and mariadb
 2018-04-23 15:29:07 +00:00
Absurdon
8b03539f01 Use path helper instead of url helper to ensure not loading non https scripts in production 2018-04-22 17:09:06 +02:00
Ari Timonen
3989846235 Update dockerfile 
Remove .env reference, clean up
 2018-04-15 12:59:57 +00:00
Ari Timonen
fe66edf712 Update docker version for CI 
Get old circleci.yml
entry.sh env
Add test.sh for testing
Update Makefile for correct docker path
ADd env/test.sh
 2018-04-15 12:51: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
b
07983b5436 Movie link info 
added info to find videos
 2018-04-13 00:18:52 +00:00
b
58355171d1 Nav dropdown cleaning 
Added NS1 gather to dropdown and minor aesthetic change
 2018-04-13 00:18:52 +00:00
b
8fc0852226 Movie link info 
added info to find videos
 2018-04-12 20:47:39 +02:00
b
0dad0316cd Nav dropdown cleaning 
Added NS1 gather to dropdown and minor aesthetic change
 2018-04-12 20:32:55 +02:00
b
f3036afba7 NS1 gather page updated 
Fixed links and spelling
 2018-04-12 17:34:30 +00:00
b
9ede492c50 NS1 gather page updated 
Fixed links and spelling
 2018-04-12 19:30:06 +02: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
811b49bc20 Make ladders 'work', they are still not rly working like a ladder 
Change contester ordering: taking amount of played games into account
 2018-02-12 23:21:08 +01:00
Absurdon
8a29678907 Allow higher amount of points for matches... ask Mega why this is needed 2018-02-12 00:15:38 +01:00
Absurdon
3e42e2d205 Fixing hint on forgot password page 2018-01-23 20:44:35 +01:00
Absurdon
d601d8643f Fixing Tests 2017-12-06 22:20:55 +01:00
Absurdon
aef90cb0bf Users only get messages sent to their primary team and removed some duplicated methods in User model 2017-12-05 22:21:16 +01:00
Absurdon
97755834f8 Prevent setting teammembers back to joining 2017-12-03 20:53:07 +01:00
Absurdon
1c22ba3482 Fix logical flaw in match proposal msg texts 2017-12-03 20:34:34 +01:00
Absurdon
121c4fc29b Reevaluating dependencies 2017-11-25 13:37:29 +01:00
Ari Timonen
c61bc3014d
Delete LICENSE.md 2017-11-25 01:59:53 +02:00
Ari Timonen
c6c8fed250
Create LICENSE 
Add MIT license.
 2017-11-25 01:55:26 +02:00
Absurdon
eb09114776 Restructuring navigation and replacing some hardcoded article URLs with new dynamic custom URLs 2017-11-12 18:50:43 +01:00
Absurdon
8c0378579b Implementing custom_url logic 2017-11-12 18:02:53 +01:00
Absurdon
0f0393ecc5 Fixing path to administrate view and added permission checks to controller 2017-11-12 18:02:53 +01:00
Absurdon
29d447e97b Implemented #show 2017-11-12 18:02:53 +01: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
756285cebe Update the password recovery page 2017-10-30 14:00:57 +01:00
Absurdon
01e40d2148 Updating the staff page 2017-10-30 13:51:03 +01:00
Absurdon
3a011eba8f Updated contact information on staff page 2017-10-30 13:38:17 +01:00
Absurdon
1257df3322 Make rules link in navigation point to current rules 2017-10-30 13:26:51 +01:00
Absurdon
60779b8c05 Fixing contests with closed signups are still joinable 2017-10-30 13:23:12 +01:00
Absurdon
7baac43cbb Fixing bug in match proposals, that prevents admins from checking them 2017-10-18 21:26:25 +02:00