Stella Rouzi
|
3fc9e43f7d
|
add event_ids to permitted params
|
2014-07-30 09:43:43 +03:00 |
|
Stella Rouzi
|
5779c99896
|
put all associations together in the user model
|
2014-07-30 09:43:43 +03:00 |
|
Stella Rouzi
|
cb0e82c88f
|
rebase fixes
|
2014-07-30 09:43:43 +03:00 |
|
Stella Rouzi
|
723c6aaafc
|
check authorization
|
2014-07-30 09:43:43 +03:00 |
|
Stella Rouzi
|
938abce9d2
|
small fixes
|
2014-07-30 09:43:43 +03:00 |
|
Stella Rouzi
|
0684dbad19
|
work on authorization in controllers and refine ability.rb
|
2014-07-30 09:43:43 +03:00 |
|
Stella Rouzi
|
2d3a1ef37e
|
tests
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
439d632251
|
adding tests and some fixes in ability
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
3f8a648f17
|
verify_user first, before authorizing resources, so that users are first prompt to sign in, instead of being presented with an 'access denied' error message.
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
9d0c9b5b25
|
do not allow access to admin area if user does not have a relevant role
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
80d48ed7d8
|
rework users page, add role assignment
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
9998e00ae3
|
fix redirect error after sign_in
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
940f76bf13
|
verify user if accessing admin area. Testing: setup organizer_conference_1_role
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
ab17e6db11
|
use single ability model
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
0418924d8e
|
add is_admin attribute to users
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
07877f3256
|
check abilities
|
2014-07-30 09:43:42 +03:00 |
|
Stella Rouzi
|
ffb290de0c
|
add necessary validations for event_attachment
|
2014-07-30 09:40:20 +03:00 |
|
Stella Rouzi
|
51d3663769
|
fix conference registration
|
2014-07-30 09:40:20 +03:00 |
|
Stella Rouzi
|
06cf1ced2b
|
fix proposal
|
2014-07-30 09:40:20 +03:00 |
|
Stella Rouzi
|
40098183e4
|
set up abilities
|
2014-07-30 09:40:20 +03:00 |
|
Stella Rouzi
|
c3ed57e3e9
|
authorization with cancancan
|
2014-07-30 09:40:20 +03:00 |
|
Stella Rouzi
|
4af0e59ca6
|
rework roles with rolify
|
2014-07-30 09:39:12 +03:00 |
|
Stella Rouzi
|
f9f840c811
|
fix tests for event types
|
2014-07-30 09:39:12 +03:00 |
|
Stella Rouzi
|
fd7f213178
|
fix event type naming
|
2014-07-30 09:39:12 +03:00 |
|
Artem Chernikov
|
748b33e7c2
|
Merge pull request #393 from waffle-iron/master
waffle.io Badge
|
2014-07-28 22:41:34 +02:00 |
|
Making GitHub Delicious.
|
d11d75f044
|
add waffle.io badge
|
2014-07-28 13:40:57 -06:00 |
|
Stella Rouzi
|
4aee4b045f
|
Merge pull request #378 from differentreality/openid_mock
user omniauth with mock credentials in development
|
2014-07-28 20:56:48 +03:00 |
|
Gopesh Tulsyan
|
993f818073
|
Merge pull request #340 from gopesht/fix#232
Navigation fixed, able to navigate to root_path from any page.
|
2014-07-28 21:31:46 +05:30 |
|
Gopesh Tulsyan
|
4a552c9623
|
Merge pull request #338 from gopesht/notify_on_cfp_update
Notify on cfp update
|
2014-07-28 21:31:02 +05:30 |
|
Gopesh Tulsyan
|
e845d79b71
|
Merge pull request #369 from gopesht/fix_email_templates
Attributes for email templates rendered conditionally, more added
|
2014-07-28 18:39:01 +05:30 |
|
Artem Chernikov
|
6e8d34f666
|
Merge pull request #375 from differentreality/typo
typo
|
2014-07-27 16:55:27 +02:00 |
|
Stella Rouzi
|
021f9fecf8
|
programm -> program
|
2014-07-27 15:53:19 +03:00 |
|
Gopesh Tulsyan
|
f5c53f77cf
|
Email notification on cfp dates updates and schedule made public
|
2014-07-26 11:15:37 +05:30 |
|
Gopesh Tulsyan
|
8cdf48c7df
|
Adds migrations for call for papers dates updates and schedule in email settings
|
2014-07-26 11:15:37 +05:30 |
|
Gopesh Tulsyan
|
7f6e218299
|
Attributes for email templates rendered conditionally, more added
|
2014-07-26 11:12:51 +05:30 |
|
Stella Rouzi
|
4184396ca7
|
user omniauth with mock credentials in development
|
2014-07-25 18:48:04 +03:00 |
|
Stella Rouzi
|
5e293e5547
|
typo
|
2014-07-24 23:30:28 +03:00 |
|
Stella Rouzi
|
2830256ebb
|
Merge pull request #313 from differentreality/questions_fix
Questions fix
|
2014-07-24 21:00:21 +03:00 |
|
Artem Chernikov
|
5870838fc1
|
Merge pull request #366 from hennevogel/errbit-filter
Ignore more exceptions. Fixes #351
|
2014-07-24 17:37:03 +02:00 |
|
Christian Bruckmayer
|
501494d3f1
|
Merge pull request #371 from ChrisBr/fix_migration
Adds reset_column_information to add_events_per_week migration
|
2014-07-24 12:02:03 +02:00 |
|
Chrisbr
|
ea920b9915
|
Adds reset_column_information to add_events_per_week migration
|
2014-07-24 11:53:52 +02:00 |
|
Christian Bruckmayer
|
0ca590a2e2
|
Merge pull request #370 from ChrisBr/fix_migration
Assert event not deleted on add_events_per_week migration
|
2014-07-24 11:38:20 +02:00 |
|
Chrisbr
|
c05b428d8c
|
Assert event not deleted on add_events_per_week migration
|
2014-07-24 11:05:03 +02:00 |
|
Gopesh Tulsyan
|
f1f0f16d5c
|
Merge pull request #355 from gopesht/email_processing_in_background
Delayed job integration done
|
2014-07-23 23:45:15 +05:30 |
|
Gopesh Tulsyan
|
c282f6c14e
|
Delayed job integration done
|
2014-07-23 21:29:55 +05:30 |
|
Henne Vogelsang
|
2dea55069d
|
Merge pull request #356 from hennevogel/proposals
Refactored proposal. Enabled cancancan
|
2014-07-23 17:56:32 +02:00 |
|
Henne Vogelsang
|
c982cbb88a
|
Refactored proposal. Enabled cancancan
|
2014-07-23 16:24:05 +02:00 |
|
Christian Bruckmayer
|
3e5a089eb1
|
Merge pull request #367 from ChrisBr/fix_js_error
Enables poltergeist and fixes js error on dashboard
|
2014-07-23 16:16:56 +02:00 |
|
Chrisbr
|
5e9cc49ef4
|
Fix Javascript error on dashboard
close #354
|
2014-07-23 16:06:37 +02:00 |
|
Chrisbr
|
6c0daf3c3e
|
Enables Javascript error validation for poltergeist
|
2014-07-23 16:06:19 +02:00 |
|