ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-26 20:41:01 +00:00
Code Issues Projects Releases Packages Wiki Activity
1089 commits 19 branches 0 tags 55 MiB
Commit graph

556 commits

Author SHA1 Message Date
simple
e97e72cf59 Merge branch 'master' of https://github.com/ENSL/ensl.org 2015-04-06 17:21:40 +02:00
simple
61e06ea89b Fix calender. Events that are to old are filtered now. 2015-04-06 17:19:53 +02:00
simple
248e06b1a2 Fix calender. Events that are to old are filtered now. 2015-04-06 17:19:53 +02:00
Ari Timonen
eb3f260f01 Fix gather music to old one 2015-04-06 01:09:36 +03:00
Ari Timonen
07fe0fc660 Fix gather music to old one 2015-04-06 01:09:36 +03:00
Ari Timonen
3f9ca0a4da Fixed rules 2015 2015-04-04 15:49:53 +03:00
Ari Timonen
6f0e8f2a0f Fixed rules 2015 2015-04-04 15:49:53 +03:00
Ari Timonen
0379c0bbcc Merge fixes 2015-04-03 23:55:22 +03:00
Ari Timonen
4a35b6bbee Merge fixes 2015-04-03 23:55:22 +03:00
Ari Timonen
f7d7c429da Fix timezone parsing for google calendar 2015-04-02 04:01:41 +03: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
eee227cef5 Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
jamal
fb7d36146e Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
jamal
06f11232da Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
jamal
756da67058 Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
jamal
ca6630000c Add .leave-gather to the command button so it disables the leave confirm dialog 2014-10-11 18:27:45 -04:00
jamal
d8134cadb7 Add .leave-gather to the command button so it disables the leave confirm dialog 2014-10-11 18:27:45 -04:00
Luke Barratt
2ef1b536cd Merge remote-tracking branch 'jamal/self-captains' into develop 
Conflicts:
	app/views/gathers/_status.html.erb
 2014-10-11 23:13:57 +01:00
Luke Barratt
f50c209702 Merge remote-tracking branch 'jamal/self-captains' into develop 
Conflicts:
	app/views/gathers/_status.html.erb
 2014-10-11 23:13:57 +01: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
bffbbcb572 Disable leave confirm when voting for map or server 2014-10-11 10:04:16 -04:00
jamal
4da97ce553 Fix double confirm when you click the 'Leave Gather' button 2014-10-11 09:13:07 -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
38e2da1bf3 Update rules article constant 2014-09-27 19:21:25 +01:00
Luke Barratt
89b3e94728 Update rules article constant 2014-09-27 19:11:19 +01:00
Luke Barratt
94840f5623 Hotfix: Rollback rules url helper 2014-08-29 00:21:23 +01:00
Luke Barratt
a8e6d20027 Hotfix: Rollback rules url helper 2014-08-28 23:43:15 +01:00
Luke Barratt
a081c910bd Tweak font weights 2014-08-28 23:33:35 +01:00
Luke Barratt
72ce102958 Fixes invalid CSS syntax 2014-08-28 23:13:07 +01:00
Luke Barratt
47c2bc4006 Added steam profile lookup API endpoint 2014-08-28 23:04:18 +01:00
Luke Barratt
0420de8983 Check for upcoming matches before showing the calendar 2014-08-28 23:04:18 +01:00
Luke Barratt
e57a3f569d Added site layout configuration for users 2014-08-28 23:04:18 +01:00
Luke Barratt
987a28d7d0 Remove TS3 Password 2014-08-28 23:04:18 +01:00
Luke Barratt
086e3ade83 Fixes forum topic ordering by latest post 2014-08-28 23:04:18 +01:00
Luke Barratt
af521fc997 Fixes error when viewing team pages when not logged in 2014-08-28 23:04:17 +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
1f4f26a5c9 Fixes body background 2014-08-28 23:04:17 +01:00
Luke Barratt
4f6cc69611 Added steam profile lookup API endpoint 2014-08-28 22:42:00 +01:00
onyxserpent
111da6b5e3 Font changes to forum thread list (theoretically) 2014-08-12 23:30:21 -07:00
onyxserpent
ffccea6c76 Shoutbox rearrangement 2014-08-10 17:07:12 -07:00
onyxserpent
949bf54e8a Shoutbox rearrangement 2014-08-10 17:07:06 -07:00
onyxserpent
7d29079430 Fixed naming conventions 2014-08-10 16:41:32 -07:00
onyxserpent
f3805a5d56 Font changes 2014-08-10 16:39:53 -07:00
onyxserpent
2362961d76 Fixes wrapping issues with small screens/mobile 2014-08-10 16:34:26 -07:00
onyxserpent
45e4a092d4 Font changes 2014-08-10 16:30:21 -07:00
onyxserpent
3b19c18b0f Update _forums.scss 
Font face changes
 2014-08-10 16:28:52 -07:00
onyxserpent
cb02b292e8 Update _news.scss 
Font face changes
 2014-08-10 16:28:14 -07:00
onyxserpent
48bb0a7986 Update _variables.scss 
Font face changes
 2014-08-10 16:25:22 -07:00
onyxserpent
129296c059 Update _typography.scss 
Font face changes
 2014-08-10 16:20:50 -07:00
Luke Barratt
aa18af9e6f Check for upcoming matches before showing the calendar 2014-08-11 00:10:40 +01:00
Luke Barratt
3f92e6e39a Added site layout configuration for users 2014-08-10 23:56:18 +01:00
Luke Barratt
ff740787b5 Remove TS3 Password 2014-08-10 23:52:01 +01:00
Luke Barratt
7f1fa1d154 Fixes forum topic ordering by latest post 2014-08-10 20:41:05 +01:00
Luke Barratt
fe230399e7 Fixes error when viewing team pages when not logged in 2014-08-10 18:33:48 +01:00
Ari Timonen
f7d846b469 Fix rules 2014-08-10 17:50:45 +01:00
Luke Barratt
86a278319a 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-10 17:42:51 +01:00
Ari Timonen
4f98a0ae04 Fix rules 2014-07-01 14:39:40 +03:00
Luke Barratt
e60cdb2039 Fixes body background 2014-06-20 10:35:29 +01:00
Ari Timonen
1a02abbf5b Make versions private for privacy reasons 2014-06-10 13:34:43 +03:00
Luke Barratt
b27ef8c465 Fixes linking to latest posts in forums 2014-06-06 22:37:43 +01:00
Luke Barratt
3d6904cd5f Fixes word wrapping issues 2014-06-06 21:10:37 +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
Room5-Joey
463b2d7e23 added autolink gem to site. We should integrate this with the forums as well? And pretty much any text field? 2014-05-19 20:52:21 +01:00
Luke Barratt
ed71ad5344 Fixes updating contests 2014-05-19 20:51:32 +01:00
Luke Barratt
8bef59868e Fixes gather music not playing during voting phase 
Fixes issues with topic ordering
Tweaked read/unread icon colours for forums
 2014-05-16 23:54:41 +01:00
Luke Barratt
e46735d912 Update favicon and titles 2014-05-16 22:25:40 +01:00
Luke Barratt
c64df4e70d Merge in alternate CSS 2014-05-16 22:10:24 +01:00
Luke Barratt
8ea7c95c8d Isolate design CSS 2014-05-11 11:27:59 +01:00
Luke Barratt
df07a5d8ba Fixes menu appearing behind forums z-index 2014-05-11 10:11:23 +01:00
Luke Barratt
caeb9be494 Fixes forums z-index appearing under logo 
Fixes view count cache
 2014-05-10 15:07:54 +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
Luke Barratt
b25de09997 Wrap long messages in the shoutbox 2014-05-10 14:12:22 +01:00
Luke Barratt
1ce05c3757 Fixes shoutbox styling 2014-05-10 13:55:40 +01:00
Ari Timonen
648248eecd Fix match admin page 2014-05-10 13:02:57 +03: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
bfbc834803 Fixes firefox rendering issues: 
Header z-index
Gather page columns
 2014-05-10 01:22:11 +01:00
Luke Barratt
ca75960bdd Added gather player count 
Improved content spacing
Colour tweaks
 2014-05-09 22:38:14 +01:00
Luke Barratt
c9922409ad Fixed impact font weightings in Windows 2014-05-06 23:59:31 +01:00
Luke Barratt
d671946c3b Improve text legibility in sidebar and forums table headers 2014-05-06 22:45:15 +01:00
Luke Barratt
644ffb41ef Added forum styling 
Improvements to sizing/spacing
 2014-05-04 12:53:47 +01:00
Luke Barratt
bc711fbdb0 Reduce schedule event spacing 2014-05-04 00:36:02 +01:00
Luke Barratt
838fa343aa Added flash notification and header styling 2014-05-04 00:01:36 +01:00
Luke Barratt
616c96c45b Added base CSS for rantology's design 2014-05-03 18:50:45 +01:00
Luke Barratt
bef2b7d887 Improved forums layout 
Made profile avatar proportional
Added header to sidebar widgets
Added bbcode colour support
 2014-05-02 17:43:23 +01:00
Luke Barratt
09026a2e4b Refactor some article views 
Tweak colour brightnesses
 2014-05-02 09:27:18 +01:00
Luke Barratt
6aa8903c11 Update button copy 
Improve news archive
 2014-05-02 09:06:12 +01:00
Ari Timonen
6f59a83fbd Change news articles to be seperate boxes 2014-05-01 23:38:33 +03:00
Luke Barratt
1376b6c897 Improve teams/matches styling 2014-04-30 01:02:07 +01:00
Luke Barratt
338d788b5a Correct error messages for PMs 2014-04-30 00:50:27 +01:00
Luke Barratt
3e757e2d76 New header layout 
Improves spacing
Improves button layout on forums
 2014-04-30 00:34:48 +01:00
Luke Barratt
2bd9376076 Improving spacing for tabs and forums 2014-04-29 21:20:02 +01:00
Luke Barratt
5a89d4c92c Improve news page layout 
Fix forums unread icon
Fix double linebreaks in BBcode
Increase colour darkness
 2014-04-29 21:02:20 +01:00
Luke Barratt
ae9717f00d Change units to px from em. Downsize all widths and font sizes 2014-04-29 19:18:14 +01:00
Luke Barratt
38fdef5363 Added proportional avatar sizing 
Improved font weights
 2014-04-28 01:37:51 +01:00
Luke Barratt
38af8961a1 Darken headers 2014-04-28 01:15:48 +01:00
Luke Barratt
337b0c1f7d Cleanup CSS variables 
User current ENSL blue colour
 2014-04-28 00:58:11 +01:00
Luke Barratt
fd0e681aa2 Rescue from AccessError with pretty and informative error page 
Add pagination to teams page
 2014-04-28 00:16:28 +01:00
Luke Barratt
30230bf645 Tweaks to users/teams list 2014-04-27 03:14:17 +01:00
Luke Barratt
8e3670f430 Merged in changes from https://github.com/taekwonjoe01/ensl.org 2014-04-27 03:11:47 +01:00
Luke Barratt
c172d04ef9 Further styling tweaks to users/profile/maps 2014-04-27 02:59:45 +01:00
Luke Barratt
563a875cb2 Improve admin challenge listing 2014-04-27 02:46:11 +01:00
Luke Barratt
2b4f0ad50f Added polls styling 2014-04-27 02:35:13 +01:00
Luke Barratt
607159807e Added categories pages styling 2014-04-27 01:47:53 +01:00
Luke Barratt
4facbc0cc3 Added groups styling 2014-04-27 01:34:38 +01:00
Luke Barratt
02a300bf97 Cleanup admin issues styling 2014-04-26 22:50:58 +01:00
Luke Barratt
cbd4f595c8 Added styling to movie pages 2014-04-26 22:28:06 +01:00
Luke Barratt
3dd1dbbf89 Added styling to file section 2014-04-26 21:21:11 +01:00
Luke Barratt
2c05ddfa26 Added styled error messages 2014-04-26 18:47:17 +01:00
Luke Barratt
8094b4da66 Improves contests, gather archive and brackets styling 2014-04-26 03:42:16 +01:00
Luke Barratt
60130f8a16 Added styling to weeks and contester form pages 2014-04-26 02:50:32 +01:00
Luke Barratt
369d3eac57 Improves gathers and article pages/forms styling 2014-04-26 02:24:47 +01:00
Luke Barratt
57a50d22d4 Added styling to servers pages 2014-04-26 01:20:34 +01:00
Luke Barratt
efbf15d844 Improved styling for contests and referee admin pages 
Fixes deleting maps form contests
 2014-04-25 23:15:15 +01:00
Luke Barratt
21fc1a1c29 Added contest edit page styling 2014-04-23 00:28:59 +01:00
Luke Barratt
8020b06f45 Updates to matches page 
Tweaked layout for contest page
Various styling updates
 2014-04-21 19:19:03 +01:00
Luke Barratt
1e64b50109 Completed restyling: 
- Bans
- Articles
- Forums
- Users

Further styling improvements to form elements
 2014-04-20 02:29:52 +01:00
Luke Barratt
1477aac4f1 Removed fixed topbar 
Improved layout
Improved form styling
Fixes issues with firefox
Added menu icons
 2014-04-19 02:12:02 +01:00
Luke Barratt
3761a73faf Layout and colour improvements 2014-04-18 01:07:07 +01:00
Luke Barratt
8d870af209 Added teams edit page styling 2014-04-17 21:26:25 +01:00
Luke Barratt
4046d25017 Tests passing with redesign 
Improved layout slightly to match grid
 2014-04-17 08:55:19 +01:00
Luke Barratt
2a661e83ce Initial changes to user show page 2014-04-16 09:44:36 +01:00
Luke Barratt
4f26f5a559 Further improvements to user pages 
Added styling to private messages
Updated puma config and deployment scripts
 2014-04-15 23:04:43 +01:00
Luke Barratt
f2d908a06f Switched web server to puma 
Added styling to gathers page
Added styling to account page
Improved forms styling
 2014-04-15 10:59:52 +01:00
Luke Barratt
8e222ae567 Added basic teams pages styling 2014-04-13 12:16:51 +01:00
Luke Barratt
ef83ec88f5 Added form view styling 
Improved articles styling
Improved bbcode to html formatting
HTML and CSS refactorings
Moved Extra into concerns
Changed repo URL to read-only for deploys
Fixes quotes in comments
 2014-04-12 02:35:42 +01:00
Luke Barratt
8eac4abebe Improved forms and error styling 
Revert colour changes
 2014-04-10 00:43:20 +01:00
Luke Barratt
63ec5d86fa Improved form element styling 
Improved article and comment styling
 2014-04-09 21:44:04 +01:00
Luke Barratt
29f4ec7246 Cleans up articles, comments and widget styling 2014-04-09 01:50:07 +01:00
Luke Barratt
5487854a6c Start to cleanup old assets 
Added new ISO country code flag icons to asset pipeline
Lots and lots of new style changes
Began converting to JS to coffeescript
 2014-04-09 00:28:53 +01:00
Luke Barratt
849f81e27d Hotfix: Error when changing articles status 2014-04-07 11:20:21 +01:00
Luke Barratt
4aa83bf4cd Initial HTML refactor 2014-04-07 11:04:56 +01:00
Luke Barratt
ca7784e97b Initial work using bourbon, neat, bitters and refills 2014-04-05 17:26:11 +01:00
Luke Barratt
7804c7adc1 Fixes z-index positioning issues 2014-04-05 02:19:08 +01:00
Luke Barratt
53901af561 Fixes logo position on forums pages 2014-04-05 02:07:59 +01:00
Luke Barratt
a3c9ab66c5 Optimize log png size 2014-04-05 02:01:33 +01:00
Luke Barratt
8b4bf75882 Updated logo to opaque version 2014-04-05 01:57:11 +01:00
Luke Barratt
4b8d6920dc Fixes repeated shout box submissions. Added delay of 2s between shouts 
Fixes admin links
Fixes issue solution formatting
 2014-04-05 01:37:52 +01:00
Luke Barratt
f438984e34 Updates to gather pages: Styling & Copy 2014-04-05 01:03:13 +01:00
Luke Barratt
ae6d146852 Added 2 hour start date overlap for calendar events 
Added new NSL logo
Change default gather passwords
Explicitly add sprockets to the Gemfile
 2014-04-04 23:56:22 +01:00
Luke Barratt
69213fc205 Hotfix: Article header box sizing CSS 2014-04-04 21:15:55 +01:00
Luke Barratt
8c9debefc3 Added ability to login with a username that is case insensitive 
Added some missing translations
Small CSS tweaks
 2014-04-04 20:38:44 +01:00
Luke Barratt
c2309dd2ef Added timezone based google calendar widget 
Updated unicorn and capistrano deployment configuration for the staging environment
HTML formatting
Fixes errors when posting new issues
Added Google Calendar client code
CSS tweaks to layout
Added new .env vars
Layout tweaks
Updated contributors
 2014-04-04 17:55:49 +01:00
Luke Barratt
53e520e0d2 Merge branch 'develop' of https://github.com/cbarratt/ensl.org into cbarratt-develop 2014-03-31 22:54:38 +01:00
Callum Barratt
e7c39a4673 Fixed formatting and ruby hash syntax 2014-03-31 22:37:38 +01:00
Luke Barratt
8abfb16db4 Prevent errors when displaying flag icons for users that have not country set. 2014-03-31 21:57:56 +01:00
Luke Barratt
cea15c1eb1 Removed dynamic_form and country_code_select gems to fold them in as a gem dependencies. 2014-03-30 23:32:11 +01:00
Luke Barratt
704a6b4e9b Changed newrelic configuration to load from environment variables 
Changed login field text
Changed database configuration connection pool size to be configured via dotenv
Use a single BBcode parser library
Added better translations coverage
Code formatting
Increases maximum article text limit
Added database cleaner with the deletion strategy during testing
 2014-03-30 20:50:52 +01:00
Luke Barratt
3b9c807594 Merge branch 'refs/heads/develop' into bug-article-text 2014-03-29 01:27:44 +00:00
Luke Barratt
8fd28245f2 Added initial API endpoint to fetch basic user and associated team information. 2014-03-29 00:59:26 +00:00
Luke Barratt
4199062a9c Initial article text code 
Added model annotations
 2014-03-26 11:09:39 +00:00
Luke Barratt
28a1112a1c Removed unused rails plugins & code/comments 2014-03-24 14:23:08 +00:00
Luke Barratt
6bcc8dc76b Purged git history and removed sensitive information. 2014-03-23 00:22:25 +00:00