gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
866 commits 2 branches 2 tags 50 MiB
Commit graph

574 commits

Author SHA1 Message Date
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
fd7f213178 fix event type naming 2014-07-30 09:39:12 +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
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
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
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
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
a88f7c168f [Bugfix] Implements check if mail templates not nil 
fix #286
 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
b504db3372 Added tests for emails views specs for addition of settings 2014-07-22 11:08:51 +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
Christian Bruckmayer
9f03531708 Merge pull request #345 from ChrisBr/bugfix_events_index 
Added nil checks for call for papers in event index
 2014-07-21 12:59:21 +02:00
Chrisbr
9d54d0db93 Added nil checks for call for papers in event index 
Changed first / lastname to name

close #342
close #344
 2014-07-21 12:36:15 +02:00
Stella Rouzi
c5fe3af9db fix: use ruby's way for interpolation 2014-07-20 19:43:21 +03:00
Stella Rouzi
be468be5d7 Only show openid options if providers are set in User model. 2014-07-20 19:43:20 +03:00
Gopesh Tulsyan
8bffa7e8c2 Navigation fixed 2014-07-19 20:36:51 +05:30
Chrisbr
d1b038c5a7 [Bugfix] Confirmed / Unconfirmed events over time for conference dashboard 2014-07-18 15:22:15 +02:00
Stella Rouzi
feb220c37d remove old model 2014-07-17 16:54:43 +03:00
Gopesh Tulsyan
74a8988abc Adds migration to Email Settings for Venue Updates 2014-07-16 19:50:36 +05:30
Henne Vogelsang
064e0a3fd7 Create default event_types. More event validations. Fixes #319 2014-07-16 14:23:16 +02:00
Henne Vogelsang
a76fa8dd59 Fix the layout of the sign in box 2014-07-16 14:23:16 +02:00