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

425 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barratt
ed95f1b3c7 Use i18n_country_select instead of country_code_select 2015-08-15 20:34:50 +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
344239502c Use protected_attributes to support legacy model protection 2015-08-15 20:27:40 +01:00
Luke Barratt
54e4c6a4bb Removed potentially dangerous regex warning 2015-08-15 20:26:57 +01:00
Luke Barratt
e2c8472023 Replace instances of #match with #get in application routes 2015-08-15 20:26:42 +01:00
Luke Barratt
239248c2ad Intital dependency updates to accomodate rails 4 2015-08-15 19:57:13 +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
Luke Barratt
de5d548e50 Style guide updates to specs 2015-08-15 19:34:25 +01:00
simplefl
5ea4193e29 Merge pull request #40 from cblanc/staging_session 
Set new session store name and domain for staging
 2015-08-15 19:49:26 +02:00
Chris Blanchard
c1430343a9 Set new session store name and domain for staging 2015-08-15 18:42:44 +01:00
Luke Barratt
d819a1cc9e Moved test-unit to the Gemfile to fix issues with activesupport 2015-08-15 17:44:33 +01:00
Luke Barratt
3020c98f57 Merge branch 'develop' into task/upgrade-ruby 2015-08-15 17:32:35 +01:00
simplefl
ec7e42a722 Merge pull request #39 from cblanc/remove_ips 
Remove IP data from plugin endpoint
 2015-08-15 14:47:30 +02:00
Chris Blanchard
a6c7e5e592 Remove IP address data from users plugin 2015-08-15 13:30:39 +01:00
Chris Blanchard
4b038406f6 Add missing groups 2015-08-15 13:25:44 +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
simplefl
14c7b9dfcf Merge pull request #38 from cblanc/revert_production_store 
Revert session cookie changes in production
 2015-08-15 12:58:33 +02:00
Chris Blanchard
159388b060 Revert session cookie changes in production 2015-08-15 11:48:55 +01:00
simplefl
ec7b259360 Merge pull request #37 from cblanc/enable_session_store_on_gathers 
Enable session store across gather domains
 2015-08-12 09:43:31 +02:00
Chris Blanchard
c16903213d Enable session store across gather domains 2015-08-12 01:54:41 +01:00
simplefl
2259791752 Merge pull request #36 from cblanc/expand_api 
Expand api
 2015-08-01 19:02:48 +02:00
Chris Blanchard
4a3634601b Added team information to usre 2015-08-01 17:05:17 +01:00
Chris Blanchard
beb3470bb9 Added ban information to user api 2015-08-01 16:44:39 +01:00
Chris Blanchard
cdfea24a87 Added maps api 2015-08-01 16:34:01 +01:00
Chris Blanchard
5fae2c46ed Ooops 2015-08-01 16:33:40 +01:00
Chris Blanchard
9736ca4d10 Added server api 2015-08-01 16:20:49 +01:00
simplefl
af59591333 Merge pull request #35 from cblanc/handle_missing_user 
Return 404 if user not found
 2015-07-22 18:34:47 +02:00
Chris Blanchard
7a18fd2ec2 Return 404 if user not found 2015-07-22 17:22:38 +01:00
simplefl
91c969a2ec Merge pull request #33 from cblanc/enrich_api 
Added additional data to users json api
 2015-07-21 16:33:52 +02:00
Chris Blanchard
17dc8854fd Added additional data to users json api 2015-07-21 14:27:33 +01:00
simplefl
d03a78b023 Bug fix and clean up with nsltv tag. 2015-07-19 12:33:49 +02:00
simplefl
6f34009120 Merge 2015-07-18 12:47:57 +02:00
simplefl
9d8b84b3e0 Display nsltv seperated in calender widget. 2015-07-18 12:35:52 +02:00
Ari Timonen
cf8c9d3ed0 Remove tweets, continued 2015-07-02 02:34:58 +03:00
Ari Timonen
4c185aec76 Remove tweets 2015-07-02 02:34:39 +03:00
simplefl
8902b9e870 Only admins can change usernames. 2015-06-27 14:25:08 +02:00
Ari Timonen
a376a4c063 Fix access check bug 2015-06-27 14:25:08 +02:00
Ari Timonen
359636a78b Remove logging functionality as legacy 2015-06-27 14:25:08 +02:00
simplefl
9c0b29f4fe Only admins can change usernames. 2015-06-27 14:23:37 +02:00
Ari Timonen
c56ff6fff5 Fix access check bug 2015-06-22 00:43:16 +03:00
Ari Timonen
432d2ae06d Remove logging functionality as legacy 2015-06-22 00:32:27 +03:00
simplefl
a4091ab35e Merge pull request #32 from ENSL/develop 
Develop
 2015-06-16 11:01:17 +02:00
simplefl
6517451704 Merge pull request #31 from cblanc/bring_back_render_out 
Restore render out method
 2015-06-16 09:26:28 +02:00
Chris Blanchard
dda68059dc Restore render out method 2015-06-15 23:44:24 +01:00
simplefl
5a35f8a579 Merge pull request #30 from cblanc/bring_back_verify 
Bring back verify
 2015-06-16 00:38:38 +02:00
Chris Blanchard
ed95f7b950 Bring back verify 2015-06-15 23:36:03 +01:00
simplefl
ae7d910dad Merge pull request #29 from cblanc/bring_back_user_plugin 
Bring back user plugin
 2015-06-16 00:22:46 +02:00
Chris Blanchard
a42547d227 Bring back user plugin 2015-06-15 23:16:59 +01:00
simplefl
3e9d7b702f Merge pull request #28 from ENSL/develop 
Up shoutbox timeout.
 2015-06-13 18:05:30 +02:00
simplefl
7433c9f9eb Up shoutbox timeout. 2015-06-13 17:53:41 +02:00