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

677 commits

Author SHA1 Message Date
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
eb67122771 Add spam text for pw recovery 2019-12-08 02:20:54 +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
Ari Timonen
8760116bef Make tests work a bit more 2019-10-22 01:57:48 +03:00
Ari Timonen
758dfda988 Update for rails 4 
Mostly tests
 2019-10-17 21:29:15 +03: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
fc94c8b8e7 Add some upgrades and pending upgrade 2019-10-10 22:12:17 +03: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
Absurdon
e93588591b
Fix #131 Updating users may fail 
Issue:
When a team gets deleted team_id is not properly cleared from users who
have set the team to be deleted as their main. When now someone trys
an operation that validates the user it fails as the team_id set on that
user is not valid anymore.

Solution:
To prevent this from happening in the future update users and set
team_id to nil.

Clean up:
To clean up existing users run
UPDATE users SET team_id=NULL WHERE team_id NOT IN(SELECT id FROM
teams);
 2019-08-24 20:17:14 +02:00
Ari Timonen
23b545779d Fix a few typos in views and models 2019-08-14 09:30:56 +03:00
Ari Timonen
91a8cdca59 Partially fix gather removal bug 2019-06-07 22:47:21 +03:00
Ari Timonen
f156ed3060 More progress on upgrade 2019-06-07 11:04:16 -04:00
Ari Timonen
ce9797aed8 More progress on Rails 4.1 update 
Just fix scopes mostly.

Add binstubs.
 2019-06-03 15:38:24 -04:00
Ari Timonen
768d3faa1b Update scopes for rails 4 2019-06-02 04:26:36 +03:00
Ari Timonen
0b53968d3d Temporary commit 2019-06-01 13:56:09 +03:00
Ari Timonen
d0f0db6165 Fix gather issue 2019-05-19 18:14:29 -04:00
Ari Timonen
6122caa125 Add gather moderators 
Fix few gather issues
 2019-05-19 18:04:18 -04:00
adsfgg
cf3f5676b0 Update Discord link in staff page 2019-03-04 19:33:00 +01:00
Ari Timonen
36029b3a6f Revert "Change gather music" 
This reverts commit e8bc227821.
 2018-12-09 18:55:40 -05:00
Ari Timonen
2f1a217a00 Revert "Update gather music" 
This reverts commit 9063e3104f.
 2018-12-09 18:55:30 -05:00
Ari Timonen
9063e3104f Update gather music 
Start from 0
 2018-12-03 15:11:26 -05:00
Ari Timonen
e8bc227821 Change gather music 2018-12-03 15:03:07 -05:00
Jiriki
b67c18dd90
Merge branch 'master' into lamefix 2018-11-24 23:44:05 +00: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
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
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
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
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
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
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
Absurdon
357bbb846b Hide private mails of all staff groups 2017-10-17 19:02:32 +02:00
Absurdon
632ed2b831 Resolves #105 - Give admins possibility to search users by their lastip 2017-10-16 19:34:28 +02:00
Absurdon
b07ddb4632 Hide staff email if set to private 2017-10-15 20:17:30 +02:00
Absurdon
fe60bcea49 Fixed an error with proposal update messages not getting sent properly 2017-10-15 14:14:53 +02:00
Absurdon
f23a8e7fc5 Fixed an error where country for teams was not properly set/updated due to a copy paste mistake 2017-10-14 20:03:40 +02:00
Absurdon
e85cf3a18d Make System send a message to opposing team whenever state of an proposal changes, sent message is dependend on new state 2017-10-13 18:22:33 +02:00
Absurdon
fa68d2ef06 Made System send a message to opposing team on proposal creation, created a clean migration for match_proposals table 2017-10-13 17:53:48 +02:00
Absurdon
4435f7f5e6 Fixed wrong tag beeing used and some styling 2017-10-08 16:03:22 +02:00
Absurdon
c8c6d823b1 Added link to match from confirmed matches list 2017-10-08 14:57:26 +02:00
Absurdon
a065db9159 Adding link to scheduled matches on contest page and bug fixing 2017-10-08 14:46:45 +02:00
Absurdon
52e0d9ad71 Improving and fixing status updating via ajax request, prevent creation of new proposals when there is a confirmed one (not tested yet) 2017-10-07 14:02:14 +02: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
548b15489c Merge branch 'master' into MatchScheduler 2017-10-06 15:35:44 +02:00
Prommah
8717173797 Return error in JSON for users API 2017-10-01 19:22:52 +02:00
Prommah
56087b09f3 404 bad user API requests & spec 2017-10-01 19:22:52 +02:00
Absurdon
6b5cafcbf0 Made API return 404 when no user was found 2017-09-30 01:06:19 +02:00
Prommah
8a49948af1 Fix users API when nothing found 2017-09-29 22:43:14 +02:00
Absurdon
78efa98276 Merge branch 'master' into MatchScheduler 2017-09-19 20:40:09 +02:00
Absurdon
9ac3cb3194 Fixing flags not showing correctly for brackets and in flat theme 2017-09-19 20:38:05 +02:00
Absurdon
62fe368b13 Fixing flags not showing correctly for brackets and in flat theme 2017-09-19 20:37:18 +02:00
Absurdon
683e32c7f6 Fixed new team view still having old country_code_select 2017-09-03 19:15:43 +02:00
Absurdon
781132781a Added delayed status and reworked update permissions for match_proposals 2017-09-01 17:52:16 +02:00
Absurdon
fa27e9fae4 Merge branch 'master' into MatchScheduler 2017-08-30 20:14:10 +02:00
Absurdon
2b45db440c Fixed team edit still using the old country_code_select 2017-08-23 23:23:18 +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
dd7b59a811 Fixed primary team of user applying to team gets updated if that team is updated 2017-08-13 01:13:35 +02:00
Absurdon
0dd9308134 Redefined access control 2017-08-13 00:06:16 +02:00
Absurdon
9fe485cd71 refined access control for updating proposals 2017-07-07 17:10:28 +02:00
Absurdon
9c9ae32a9c Merge branch 'master' into MatchScheduler 2017-07-07 16:05:02 +02:00
Absurdon
f31668fb44 fixed more places where NULL category could cause problems when editing issues as admin 2017-07-03 08:50:00 +02:00
Absurdon
784c5832cf fixed issues with NULL category not showing 2017-07-02 22:48:33 +02:00
Absurdon
9312a90585 refined issue to have more clear permission logic 2017-07-02 21:16:16 +02:00
Absurdon
0bf5e74c38 added filter to show only users logged in lately 2017-07-02 18:34:19 +02:00
Absurdon
f06dfc025a show count for users signed in the last 30 days on users page 2017-07-02 17:14:07 +02:00
Absurdon
3edf8cc5e7 added comp mod council to staff page 2017-07-02 16:31:36 +02:00
Absurdon
dfbe4686ff reworked match proposal update to allow stricter controll 2017-06-30 14:03:46 +02:00
Absurdon
8579d0b569 gave gathermods the possibility to respond to gather issues 2017-06-24 20:43:42 +02:00
Absurdon
313500c257 added gather mod tab to staff page 2017-06-21 09:39:30 +02:00
Absurdon
df5c6b1a7a fixed parsed signatures might be bigger than allowed by database 2017-06-12 20:30:10 +02:00
Absurdon
29a6a83887 Added submit function and processing 2017-06-11 16:36:10 +02:00
Absurdon
c4fa4bd188 Added proposal actions 2017-06-11 15:09:30 +02:00
Absurdon
ca9cdeb200 Fixed Syntax Error and error in Access Control 2017-06-04 20:30:33 +02:00
Absurdon
04f2fd77ff Added view for creating proposals and added some controller functionality 2017-05-11 22:26:18 +02:00
Absurdon
0f05829bcc started to shape out the controllers 2017-05-05 17:17:00 +02:00
Absurdon
160fccd118 Added model and controller stub 2017-05-01 16:57:32 +02:00
Absurdon
925001b73d Updated all links to use https 2017-04-18 16:01:36 +02:00
Absurdon
d3fdef95c4 Updated all links to use https 2017-04-18 16:01:36 +02:00
Absurdon
bb5bd6c824 Switched gathers url to use https 2017-04-18 00:04:18 +02:00
Absurdon
1f9f5f8dce Switched gathers url to use https 2017-04-18 00:04:18 +02:00
Absurdon
f6ecbb9f4d gave referees a possibility to signup for matches 2017-04-13 19:32:07 +02:00
Absurdon
5cc9dc411f gave referees a possibility to signup for matches 2017-04-13 19:32:07 +02:00
Absurdon
4508e11270 Fixed calendar widget entries showin in wrong order 2017-04-04 17:24:37 +02:00
Absurdon
5ac3766a63 Fixed calendar widget entries showin in wrong order 2017-04-04 17:24:37 +02:00
Absurdon
0c18e7f9ba added correct linking to nsltv events 2017-04-04 12:16:32 +02:00
Absurdon
807fe267dc added correct linking to nsltv events 2017-04-04 12:16:32 +02:00
Absurdon
eb43c87f00 made streamlinks from event description show as link in calendar widget 2017-04-04 12:11:36 +02:00
Absurdon
bda00fbef9 made streamlinks from event description show as link in calendar widget 2017-04-04 12:11:36 +02:00
Absurdon
b411f559b8 Made Calendar Integration failsafe and use google-api-client gem 2017-04-03 01:02:09 +02:00
Absurdon
bac4f137c3 Made Calendar Integration failsafe and use google-api-client gem 2017-04-03 01:02:09 +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
Absurdon
c882419af2 Merge remote-tracking branch 'origin/master' 2017-03-21 16:04:14 +01:00
Absurdon
9c43c5cb8d Merge remote-tracking branch 'origin/master' 2017-03-21 16:04:14 +01:00
Absurdon
4e319ed5e9 Disabled Google calender as it seems broken right now 2017-03-21 16:01:30 +01:00
Absurdon
fedf1473d3 Disabled Google calender as it seems broken right now 2017-03-21 16:01:30 +01:00
Absurdon
e50ba391fe Updated the contact page 2017-03-19 02:37:44 +01:00
Absurdon
bc01a9fbb5 Updated the contact page 2017-03-19 02:37:44 +01:00
Absurdon
4ebb95ca3a Fixed link formatting error 2017-03-15 13:53:18 +01:00
Absurdon
946342bffb Fixed link formatting error 2017-03-15 13:53:18 +01:00
Absurdon
b1e451030c fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
cafd421d0a fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
9989e840aa fixed logical flaw in last commit 2017-03-08 02:21:49 +01:00
Absurdon
839aae732a fixed logical flaw in last commit 2017-03-08 02:21:49 +01:00
Absurdon
035f15648a fixed error for old bans that don't have a creator 
validation failed on editing older bans that do not have a creator. Added a check to make sure this is still working.
 2017-03-08 01:45:33 +01:00
Absurdon
4ce05f2563 fixed error for old bans that don't have a creator 
validation failed on editing older bans that do not have a creator. Added a check to make sure this is still working.
 2017-03-08 01:45:33 +01:00
Absurdon
91d585f378 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
7b32035f67 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
569122862f Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +01:00
Absurdon
39758ff86c Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +01:00
Absurdon
5fac74f715 added creator field to ban/show.html.erb 2017-03-04 22:50:36 +01:00
Absurdon
662f4129eb added creator field to ban/show.html.erb 2017-03-04 22:50:36 +01:00
Absurdon
9a0d2c6a25 Added creator to ban modell 2017-03-04 22:45:05 +01:00
Absurdon
c6a0ed106f Added creator to ban modell 2017-03-04 22:45:05 +01:00
Absurdon
f3baf7e896 Fixed issue#97 2017-03-03 14:09:14 +01:00
Absurdon
888f7ad9e2 Fixed issue#97 2017-03-03 14:09:14 +01:00
Absurdon
f17af42bfd Update to new rules and updated categories 2017-02-27 23:21:59 +01:00
Absurdon
4a863ee5f4 Update to new rules and updated categories 2017-02-27 23:21:59 +01:00
Absurdon
cdb77d27a7 Fixed new PMs not highlighted 2017-02-16 01:41:36 +01:00
Absurdon
11a300871f Fixed new PMs not highlighted 2017-02-16 01:41:36 +01:00
Absurdon
d066dcc303 fixed gathercount not getting loaded immediatly 2017-02-13 00:00:06 +01:00
Absurdon
3d6826d467 fixed gathercount not getting loaded immediatly 2017-02-13 00:00:06 +01:00
Absurdon
e7f41948d3 Fixed Comp Mod link lable 2017-02-12 22:59:23 +02:00
Absurdon
0ebc9fb875 Fixed Comp Mod link lable 2017-02-12 22:59:23 +02:00