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

671 commits

Author SHA1 Message Date
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
Luchs
f89771ffaf Also return users without a team on UserCollection service 2017-02-12 22:46:41 +02:00
Luchs
d5d804a56f Also return users without a team on UserCollection service 2017-02-12 22:46:41 +02:00
Absurdon
0f397f9e7c added link to comp mod article 2017-01-14 22:30:19 +02:00
Absurdon
cffa92e845 added link to comp mod article 2017-01-14 22:30:19 +02:00
Absurdon
be6d5ec461 fallback gather link as fixed redirect link 
changing the fallback gather link to point to "http://www.ensl.org/gathers/latest/ns2" to make sure it points to the correct gather even without the user having to reload the page first
requested by mega Jan 01 2017
 2017-01-14 22:30:19 +02:00
Absurdon
0f66511f95 fallback gather link as fixed redirect link 
changing the fallback gather link to point to "http://www.ensl.org/gathers/latest/ns2" to make sure it points to the correct gather even without the user having to reload the page first
requested by mega Jan 01 2017
 2017-01-14 22:30:19 +02:00
Absurdon
ac2e95799c periodic gather count update 
Made it so the page updates the gather fill status in the navigation periodicaly (every 10 seconds)
 2017-01-14 22:30:19 +02:00
Absurdon
a6876b8d9d periodic gather count update 
Made it so the page updates the gather fill status in the navigation periodicaly (every 10 seconds)
 2017-01-14 22:30:19 +02: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
Chris Blanchard
ba556ca1fe Please forgive me 2016-02-05 16:58:10 +00:00
Chris Blanchard
a496589d14 Please forgive me 2016-02-05 16:58:10 +00:00
simplefl
c226eb504c Merge pull request #73 from Prommah/develop 
Fix Verification.contain bug & other cleanliness
 2015-11-09 09:48:44 +01:00
simplefl
9dc068e5fc Merge pull request #73 from Prommah/develop 
Fix Verification.contain bug & other cleanliness
 2015-11-09 09:48:44 +01:00
Prommah
66fe8c0726 Fix styling 2015-11-08 23:09:56 +00:00
Prommah
3016346211 Fix styling 2015-11-08 23:09:56 +00: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
97f9366403 Fixed profle query error when there are zero results 2015-11-07 06:11:26 +00:00
Prommah
7a41f1294c Fixed profle query error when there are zero results 2015-11-07 06:11:26 +00:00
simplefl
b8ca86cd10 Merge pull request #72 from Prommah/develop 
Merge lineup forms & fix hound (again)
 2015-11-07 01:02:18 +01:00
simplefl
a1ca59df88 Merge pull request #72 from Prommah/develop 
Merge lineup forms & fix hound (again)
 2015-11-07 01:02:18 +01:00
Prommah
dbad31fddc Merge lineup forms 2015-11-06 19:43:30 +00:00
Prommah
e7d5662bb6 Merge lineup forms 2015-11-06 19:43:30 +00:00
simplefl
f7123b3c92 Merge pull request #70 from cblanc/team_country_flags 
Add EU flag to teams
 2015-11-06 18:56:23 +01:00
simplefl
b03d09614b Merge pull request #70 from cblanc/team_country_flags 
Add EU flag to teams
 2015-11-06 18:56:23 +01:00
Chris Blanchard
1faed511fc Add EU flag to teams 2015-11-06 15:23:50 +00:00
Chris Blanchard
b4d50b7eb3 Add EU flag to teams 2015-11-06 15:23:50 +00:00
Prommah
71424d9207 Fix rubocop offenses 2015-11-05 08:25:54 +00:00
Prommah
1b0de57cc3 Fix rubocop offenses 2015-11-05 08:25:54 +00:00
Prommah
67f603789f Fixed caster selection 2015-11-05 07:59:52 +00:00
Prommah
6e9b84fdee Fixed caster selection 2015-11-05 07:59:52 +00:00
Prommah
a4f4f074ae Cleaned up match model 2015-11-05 07:57:55 +00:00
Prommah
0e12505f9d Cleaned up match model 2015-11-05 07:57:55 +00:00
Prommah
9ef8b7a24b Remove disused & hidden match score page 2015-11-04 14:17:57 +00:00
Prommah
83efd5f21c Remove disused & hidden match score page 2015-11-04 14:17:57 +00:00
simplefl
b0b0770f10 Merge pull request #64 from Prommah/user-api-steamid 
Allow querying of the user API with SteamIDs
 2015-10-28 18:12:00 +01:00
simplefl
782751590b Merge pull request #64 from Prommah/user-api-steamid 
Allow querying of the user API with SteamIDs
 2015-10-28 18:12:00 +01:00
Prommah
1449f45321 Add support for querying users via steamid in the user API 2015-10-28 14:31:05 +00:00
Prommah
ae9882beb7 Add support for querying users via steamid in the user API 2015-10-28 14:31:05 +00:00
Prommah
f4e8ecdcd6 Don't show any SteamID stuff if that's blank too 2015-10-28 02:40:38 +00:00
Prommah
9541076d6c Don't show any SteamID stuff if that's blank too 2015-10-28 02:40:38 +00:00
Prommah
a96949340a Don't show anything for blank profile values. 2015-10-28 02:32:45 +00:00
Prommah
970f56bc9a Don't show anything for blank profile values. 2015-10-28 02:32:45 +00:00
Chris Blanchard
bfc79cddcb Return moderator status with users api 2015-10-20 18:11:46 +01:00
Chris Blanchard
90b5bf3f1f Return moderator status with users api 2015-10-20 18:11:46 +01:00
Chris Blanchard
95deb32e05 Added moderator group 2015-10-20 18:04:50 +01:00
Chris Blanchard
39ff2b66d8 Added moderator group 2015-10-20 18:04:50 +01:00
Prommah
27aebc2a29 Fix styling and tidy validations 2015-09-24 10:19:00 +01:00
Prommah
aafbc4e657 Fix styling and tidy validations 2015-09-24 10:19:00 +01:00
Prommah
65cf350231 Improve & clean SteamID validation 2015-09-24 07:23:05 +01:00
Prommah
29ed865b27 Improve & clean SteamID validation 2015-09-24 07:23:05 +01:00
Prommah
07a22ce0f3 Skip unnecessary condenser lookups 2015-09-24 04:03:24 +01:00
Prommah
fea56afc31 Skip unnecessary condenser lookups 2015-09-24 04:03:24 +01:00
Prommah
ff1061272c Return null steam data for previously invalid SteamIDs 2015-09-24 03:16:35 +01:00
Prommah
f3c7942501 Return null steam data for previously invalid SteamIDs 2015-09-24 03:16:35 +01:00
Prommah
3948541f10 Stricter SteamID validation 2015-09-24 01:35:30 +01:00
Prommah
798484af96 Stricter SteamID validation 2015-09-24 01:35:30 +01:00
Prommah
03538de390 Stricter SteamID validation 2015-09-24 01:32:16 +01:00
Prommah
758b0250fe Stricter SteamID validation 2015-09-24 01:32:16 +01:00
simplefl
c128833f8f Merge pull request #56 from cblanc/expose_new_gathers 
Expose new gathers
 2015-09-18 17:05:01 +02:00
simplefl
e63bd866b6 Merge pull request #56 from cblanc/expose_new_gathers 
Expose new gathers
 2015-09-18 17:05:01 +02:00
Chris Blanchard
6fe08003b2 Add helper method for new gathers url 2015-09-18 13:35:17 +01:00
Chris Blanchard
d70075de84 Add helper method for new gathers url 2015-09-18 13:35:17 +01:00
simplefl
e774f38bf5 Merge pull request #55 from ENSL/develop 
Develop
 2015-09-06 11:58:31 +02:00
simplefl
94bbece2d6 Merge pull request #55 from ENSL/develop 
Develop
 2015-09-06 11:58:31 +02:00
Chris Blanchard
d4db1aafdf Limit by 200 2015-09-05 19:16:14 +01:00
Chris Blanchard
c51ec2447c Limit by 200 2015-09-05 19:16:14 +01:00
Chris Blanchard
fc7dd7286e Return distinct topics 2015-09-05 17:09:20 +01:00
Chris Blanchard
a5cfa4df74 Return distinct topics 2015-09-05 17:09:20 +01:00
Chris Blanchard
bafb67f702 Rewrite recent_topic sql to return unique topics on subquery 2015-09-05 16:23:50 +01:00
Chris Blanchard
e0eaa89fbf Rewrite recent_topic sql to return unique topics on subquery 2015-09-05 16:23:50 +01:00
Luke Barratt
2901f815e4 Merge branch 'develop' 2015-08-31 16:33:11 +01:00
Luke Barratt
6b6de118e1 Merge branch 'develop' 2015-08-31 16:33:11 +01:00
Chris Blanchard
66fc2c3220 Return steamid to users api 2015-08-30 15:58:06 +01:00
Chris Blanchard
22df398bae Return steamid to users api 2015-08-30 15:58:06 +01:00
simplefl
19b8cf877c Merge pull request #50 from cblanc/show_stream 
Show stream information on user page
 2015-08-27 20:00:50 +02:00
simplefl
c81c38ec27 Merge pull request #50 from cblanc/show_stream 
Show stream information on user page
 2015-08-27 20:00:50 +02:00
Chris Blanchard
3694832277 Show stream information on user page 2015-08-27 18:47:26 +01:00
Chris Blanchard
7c6b66a43d Show stream information on user page 2015-08-27 18:47:26 +01:00
Chris Blanchard
f05f072f1c Return server name 2015-08-27 11:58:30 +01:00
Chris Blanchard
0d090f78c3 Return server name 2015-08-27 11:58:30 +01:00
Chris Blanchard
8032c8e93e Account goes to user profile 2015-08-27 11:58:16 +01:00
Chris Blanchard
14eebf985e Account goes to user profile 2015-08-27 11:58:16 +01:00
Chris Blanchard
83dc747a51 Account goes to user profile 2015-08-24 16:02:55 +01:00
Chris Blanchard
3616b90e3d Account goes to user profile 2015-08-24 16:02:55 +01:00
simplefl
817f32ce90 Merge pull request #42 from cblanc/fix_users_api 
Fix users api
 2015-08-23 21:33:57 +02:00
simplefl
f652536307 Merge pull request #42 from cblanc/fix_users_api 
Fix users api
 2015-08-23 21:33:57 +02:00
Luke Barratt
7738c2b845 Fold legacy has_view_count plugin into lib 2015-08-23 15:43:40 +01:00
Luke Barratt
e3f0a79479 Fold acts_as_rateable plugin into lib 2015-08-23 13:25:41 +01:00
Luke Barratt
4d04c47251 Fold in acts_as_readable plugin into lib so that it's loaded properly 2015-08-23 12:06:27 +01:00
Luke Barratt
f8fd66e152 Use steam-condenser from GitHub source again to avoid issues with Constant collisions 2015-08-23 11:25:35 +01:00
Luke Barratt
48dc948fc0 Merge branch 'develop' into feature/rails-4 2015-08-23 11:00:14 +01:00
Chris Blanchard
eecabbf1e6 Hound 2015-08-22 11:53:26 +01:00
Chris Blanchard
4cfa9a7e0d Hound 2015-08-22 11:53:26 +01:00
Chris Blanchard
9ba7f4b0d1 Add filter to recent topics 2015-08-22 10:48:08 +01:00
Chris Blanchard
4377d07095 Add filter to recent topics 2015-08-22 10:48:08 +01:00
Chris Blanchard
a0318805e7 Annotate & fix style 2015-08-20 19:36:01 +01:00
Chris Blanchard
5948364ec2 Annotate & fix style 2015-08-20 19:36:01 +01:00
Chris Blanchard
5f53893756 Added forumer exclusion on recent_topics 2015-08-20 19:33:22 +01:00
Chris Blanchard
5bde263e8c Added forumer exclusion on recent_topics 2015-08-20 19:33:22 +01:00
Chris Blanchard
53110c9aa4 Scope no longer used 2015-08-20 17:21:56 +01:00
Chris Blanchard
19b5679ff3 Scope no longer used 2015-08-20 17:21:56 +01:00
Chris Blanchard
a68bdd3de7 Remove inefficient scope 2015-08-20 17:01:42 +01:00
Chris Blanchard
70171dfbbd Remove inefficient scope 2015-08-20 17:01:42 +01:00
Chris Blanchard
8074f0c3aa Style fix 2015-08-20 16:35:25 +01:00