Commit graph

403 commits

Author SHA1 Message Date
Stella Rouzi
09dea4b4c5 fix typo openSUSE 2014-08-15 13:10:35 +03:00
Stella Rouzi
911143c006 fix in admin menu and rework menu tests 2014-08-14 16:46:34 +03:00
Stella Rouzi
ba6643a394 fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout 2014-08-14 11:37:30 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
1cbf78df3d create @user with cancan for remove_user action 2014-08-13 22:53:14 +03:00
Stella Rouzi
e9a57f78a3 style 2014-08-13 22:53:14 +03:00
Stella Rouzi
d13c1a83e4 fix in questions 2014-08-13 22:53:14 +03:00
Stella Rouzi
bbeae5e0ff fix 2014-08-13 22:53:14 +03:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts
Add email settings to user accounts
2014-08-13 09:22:34 +05:30
Gopesh Tulsyan
fe17bd26e5 Merge pull request #440 from gopesht/add_home_route_to_splash
Added route to root path for navigation from splash
2014-08-13 09:20:56 +05:30
Gopesh Tulsyan
4809edffe4 Removed brand helper for consistency, replaced glyphicons with fontawesome icons 2014-08-12 17:04:16 +05:30
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30
Chrisbr
22cc5e4f14 Extracting Photos form Conference edit form
close #384
2014-08-12 08:38:51 +02:00
Chrisbr
a8b94c13f3 Refactoring Conference Basics #384 2014-08-12 08:32:45 +02:00
Gopesh Tulsyan
ddfe8e5227 Fix splash layouts, other ui fixes 2014-08-07 16:34:22 +05:30
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object
close #420
2014-08-06 14:30:50 +02:00
Henne Vogelsang
5aa0d58c57 Move Conference contact details to Contact 2014-08-01 14:30:10 +02:00
Henne Vogelsang
eb3e6898d2 Implements Contacts 2014-08-01 14:30:10 +02:00
Henne Vogelsang
5f96c276e9 Rework the Sign Up/Sign In views
Use Capybaras save_page when feature tests go wrong
2014-08-01 13:35:06 +02:00
Henne Vogelsang
e9bf2f8399 Style the general dashboard icons 2014-08-01 10:12:04 +02: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
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
7f6e218299 Attributes for email templates rendered conditionally, more added 2014-07-26 11:12:51 +05:30
Stella Rouzi
2830256ebb Merge pull request #313 from differentreality/questions_fix
Questions fix
2014-07-24 21:00:21 +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
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
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
74a8988abc Adds migration to Email Settings for Venue Updates 2014-07-16 19:50:36 +05:30
Henne Vogelsang
a76fa8dd59 Fix the layout of the sign in box 2014-07-16 14:23:16 +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
75cf1123cf Adds email template and settings for conference dates updates 2014-07-15 16:25:16 +05:30
Stella Rouzi
2966b92319 style fixes 2014-07-14 21:14:32 +03:00
Stella Rouzi
4a8c2173d4 remove put method 2014-07-14 21:14:32 +03:00
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
Gopesh Tulsyan
c34991db44 Merge pull request #285 from gopesht/footer
Adds button to navigate to topmost component onscroll
2014-07-04 02:30:13 +05:30
Gopesh Tulsyan
7941cac81e Adds button for navigating to topmost component onscroll
Changed color of the button to white
2014-07-03 23:58:57 +05:30
Gopesh Tulsyan
d195d9ca70 Integrated toopay/bootstrap-markdown 2014-07-02 23:23:20 +05:30
Gopesh Tulsyan
8efcd69f3d Added hints to description fields to use markdown syntax, rendered all description fields in the splash as markdown 2014-07-02 23:23:19 +05:30
Gopesh Tulsyan
3bf54f991a Increased size of modal, added description as caption to photos 2014-07-02 00:25:09 +05:30
Gopesh Tulsyan
bea55454b2 Conditional rendering for gallery button in the splash 2014-07-01 23:54:39 +05:30
Gopesh Tulsyan
81c538d82d Putting the js inside ready function 2014-07-01 22:10:29 +05:30