Commit graph

227 commits

Author SHA1 Message Date
Stella Rouzi
cb0e82c88f rebase 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
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
51d3663769 fix conference registration 2014-07-30 09:40:20 +03:00
Stella Rouzi
c3ed57e3e9 authorization with cancancan 2014-07-30 09:40:20 +03:00
Stella Rouzi
fd7f213178 fix event type naming 2014-07-30 09:39:12 +03:00
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
f5c53f77cf Email notification on cfp dates updates and schedule made public 2014-07-26 11:15:37 +05:30
Stella Rouzi
5e293e5547 typo 2014-07-24 23:30:28 +03:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Chrisbr
6f3426b6a2 Implements "Add template" button for email settings
close #16
Subjects now mandatory if send mail enabled
2014-07-23 13:42:18 +02:00
Chrisbr
2254c2e359 [Bugfix] Added missing namespace for TransitionsException 2014-07-23 13:42:18 +02:00
Chrisbr
424bf19a91 [Bugfix] Admin event states controller
#286
fix #287
2014-07-23 13:42:17 +02:00
Artem Chernikov
d9d72eae07 Merge pull request #349 from openSUSE/review_140721_basic_rubocop_rules
[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140721_basic_rubocop_rules'
2014-07-23 11:00:30 +02:00
Artem Chernikov
9a3451af4f Merge pull request #311 from differentreality/openid
Only show openid options if providers are set in User model.
2014-07-22 23:30:12 +02:00
Gopesh Tulsyan
b2ab893d17 Merge pull request #318 from gopesht/notify_on_venue_change
Email notification to all participants on venue update
2014-07-22 21:37:29 +05:30
Gopesh Tulsyan
5baeee9ee8 Venue update notifications done 2014-07-22 11:08:50 +05:30
Artem Chernikov
5289f41eb5 Use only new hash syntax 2014-07-21 15:05:58 +02:00
Artem Chernikov
3901973fd6 Do not use variables in void context 2014-07-21 15:05:58 +02:00
Artem Chernikov
31212b4f1c Fix linting cops 2014-07-21 15:05:58 +02:00
Artem Chernikov
056fe5ec3f Fix others additional lints 2014-07-21 15:05:58 +02:00
Artem Chernikov
763f864dc9 Fix basic style issues with rubocop 2014-07-21 15:05:58 +02:00
Stella Rouzi
be468be5d7 Only show openid options if providers are set in User model. 2014-07-20 19:43:20 +03:00
Chrisbr
d1b038c5a7 [Bugfix] Confirmed / Unconfirmed events over time for conference dashboard 2014-07-18 15:22:15 +02:00
Gopesh Tulsyan
6d847547b7 Adds email template and settings for conference registration dates updates
Added tests

Minor typo
2014-07-15 16:26:06 +05:30
Gopesh Tulsyan
861c1af729 Conference date update email notification completed
Added tests
2014-07-15 16:25:16 +05:30
Gopesh Tulsyan
c68c6394bc Removed conference_date_string_helper, moved date_string to application_controller
Deleted home_helper.rb
2014-07-10 22:12:11 +05:30
Chrisbr
61f913b727 Implements OPTIONS http verb for root path
close #294
2014-07-08 09:18:32 +02:00
Artem Chernikov
494003892c add skipped empty lines 2014-07-03 11:18:33 +02:00
Gopesh Tulsyan
3bf54f991a Increased size of modal, added description as caption to photos 2014-07-02 00:25:09 +05:30
Gopesh Tulsyan
1244f937e6 Multiple ajax calls fixed 2014-07-01 22:02:52 +05:30
Gopesh Tulsyan
220e816155 Gallery initiated 2014-07-01 21:52:33 +05:30
Stella Rouzi
1678c21996 fix in parameters 2014-06-30 19:15:06 +03:00
Stella Rouzi
a87018192a style fixes 2014-06-30 15:46:52 +03:00
Stella Rouzi
fc753282d3 hound fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
9292b79c78 houndci fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
Gopesh Tulsyan
2b94ba0281 Adds routing error check in conference#show
Adds make_conference_public to conference factory

Added test
2014-06-19 22:17:32 +05:30
Stella Rouzi
0c698bac10 Merge pull request #253 from differentreality/final_openid
Authenticate via openid
2014-06-19 15:53:56 +03:00
Artem Chernikov
8803384d2f Merge pull request #229 from differentreality/create_conf_indicator
remove readonly option for start_date and end_date of conference
2014-06-19 14:04:04 +02:00
Stella Rouzi
de58ddde50 openid fixes 2014-06-19 12:58:05 +03:00
Stella Rouzi
600adde6ba implement openID authentication 2014-06-19 12:58:05 +03:00