Commit graph

812 commits

Author SHA1 Message Date
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
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
Gopesh Tulsyan
74a8988abc Adds migration to Email Settings for Venue Updates 2014-07-16 19:50:36 +05:30
Henne Vogelsang
1d3c84c24d Make the spec aware of our new default event_types 2014-07-16 14:23:16 +02:00
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
Henne Vogelsang
b4dd8c8d22 Move the footer further down to separate it more from the content 2014-07-16 14:23:16 +02:00
Artem Chernikov
bd3f251c45 Merge pull request #322 from openSUSE/review_140716_update_schema
Update schema, fixes #320
2014-07-16 14:00:47 +02:00
Artem Chernikov
874588f1fe Merge pull request #307 from openSUSE/review_140712_remove_therubyracer
Remove therubyracer because of the following reasons:
2014-07-16 14:00:36 +02:00
Artem Chernikov
a4ebd4b772 Update schema, fixes #320 2014-07-16 11:17:57 +02:00
James Mason
143e20d1a3 Merge pull request #298 from gopesht/notify_on_date_change
Notify on date change
2014-07-15 08:10:21 -07:00
Gopesh Tulsyan
8acf3c088a Added test for email notification on conference dates and registration dates updates 2014-07-15 16:26:06 +05:30
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
c16d76c9b8 Adds migration for Conference Registration Dates to Email Settings 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
75cf1123cf Adds email template and settings for conference dates updates 2014-07-15 16:25:16 +05:30
Artem Chernikov
aee73fb442 Merge pull request #312 from differentreality/user_fields_volunteers
Add volunteer fields to user
2014-07-14 21:47:16 +02:00
Artem Chernikov
93ced1ee38 Merge pull request #314 from differentreality/attachment_default
fix attachment_default migration
2014-07-14 21:46:46 +02:00
Stella Rouzi
0f9242cbd2 fix attachment_default migration 2014-07-14 21:19:42 +03:00
Gopesh Tulsyan
6f5ab8988c Merge pull request #310 from gopesht/unused_route
Unused route for Conference#show
2014-07-14 21:35:31 +05:30
Stella Rouzi
e37e0a50c8 add volunteer fields to user 2014-07-14 17:36:58 +03:00