Commit graph

831 commits

Author SHA1 Message Date
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
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
Christian Bruckmayer
0ae7991943 Merge pull request #360 from ChrisBr/event_states_bf_new
Email Settings refactoring and bug fixes
2014-07-23 15:39:07 +02:00
Henne Vogelsang
ab4730d0a8 Merge pull request #365 from hennevogel/master
Exchange debugger for byebug
2014-07-23 15:37:22 +02:00
Henne Vogelsang
4b61d29e8d Exchange debugger for byebug
https://github.com/cldwalker/debugger/issues/125#issuecomment-43353446
2014-07-23 15:34:05 +02:00
Christian Bruckmayer
35c5116051 Merge pull request #347 from ChrisBr/fix_test_dates
Implements timecop to make tests independent from DateTime
2014-07-23 15:20:44 +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
7192e2fe49 Send mail attributes are now on default false 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
79937d5338 Fix polthergeist issues 2014-07-23 10:52:54 +02:00
Chrisbr
7c51d1a42f Implements timecop to make tests independent from DateTime (close #327) 2014-07-23 10:28:15 +02:00
Artem Chernikov
ade64f339f Merge pull request #357 from gopesht/fix_flickering_test
Set js_errors to false in poltergeist driver
2014-07-23 09:42:00 +02:00
Gopesh Tulsyan
b4a838bfb2 Set js_errors to false in poltergeist driver 2014-07-23 12:28:49 +05:30
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
Artem Chernikov
5717f1f55b Add readme section about style 2014-07-22 10:22:12 +02:00
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
d245b9db12 Echo version of phantomjs in use 2014-07-21 16:05:30 +02:00
Artem Chernikov
949ce14fca Update travis and rubocop to work together 2014-07-21 15:57:54 +02:00
Artem Chernikov
98e9dec252 Fix travis rubocop 2014-07-21 15:23:10 +02:00
Artem Chernikov
ad2ec92cfa Add rubocop to travis run 2014-07-21 15:06:22 +02:00
Artem Chernikov
bce659a5d9 Move Accessor names to todo 2014-07-21 15:05:58 +02:00
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
Artem Chernikov
f4a22851a1 Update rubocop and add basic checks 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
Christian Bruckmayer
a136b8a609 Merge pull request #297 from ChrisBr/bugfix_events_over_time_new
[Bugfix] Confirmed / Unconfirmed events over time for conference dashboard
2014-07-21 11:32:53 +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
Chrisbr
d1b038c5a7 [Bugfix] Confirmed / Unconfirmed events over time for conference dashboard 2014-07-18 15:22:15 +02:00
Stella Rouzi
609f2fd564 Merge pull request #334 from differentreality/event_person_delete
remove old model
2014-07-18 11:08:58 +03:00
Stella Rouzi
feb220c37d remove old model 2014-07-17 16:54:43 +03:00
Artem Chernikov
64e191f60e Load env on deploy 2014-07-17 10:39:49 +02:00
Artem Chernikov
1b51b15d18 Attempt to fix hoptoad 2014-07-17 10:19:13 +02:00
Henne Vogelsang
2068d25d84 Merge pull request #328 from hennevogel/master
Various small fixes
2014-07-16 19:44:09 +02:00