Commit graph

862 commits

Author SHA1 Message Date
Artem Chernikov
4aa1f0bf3a rubocop Style/AndOr style enabled 2014-07-30 23:34:09 +02:00
Artem Chernikov
f8784fdcd8 rubocop style fix Style/AlignParameters 2014-07-30 23:32:29 +02:00
Artem Chernikov
cb810e58ce Style/AlignHash fix 2014-07-30 23:29:52 +02:00
Christian Bruckmayer
518e1cc62b Merge pull request #397 from ChrisBr/fix_charts
[Bugfix] Dashboard line charts fixed
2014-07-30 16:11:16 +02:00
Chrisbr
1c5e876364 [Bugfix] Dashboard line charts fixed 2014-07-30 15:56:34 +02:00
Gopesh Tulsyan
52e1809227 Merge pull request #373 from gopesht/fix_emails_with_dj
Fixing emails to send them with delayed jobs
2014-07-30 17:32:14 +05:30
Artem Chernikov
9dc847671c Merge pull request #394 from openSUSE/review_140729_do_not_accept_decreased_code_coverage
Add line about coverage decrease
2014-07-30 12:00:23 +02:00
Artem Chernikov
90918d9c27 Adapt wording [ci skip] 2014-07-29 22:27:38 +02:00
Artem Chernikov
3fd89c7e03 Add line about coverage decrease 2014-07-29 22:26:37 +02:00
Artem Chernikov
748b33e7c2 Merge pull request #393 from waffle-iron/master
waffle.io Badge
2014-07-28 22:41:34 +02:00
Making GitHub Delicious.
d11d75f044 add waffle.io badge 2014-07-28 13:40:57 -06:00
Gopesh Tulsyan
8678b90129 Fixing emails to send them with delayed jobs 2014-07-29 00:50:39 +05:30
Stella Rouzi
4aee4b045f Merge pull request #378 from differentreality/openid_mock
user omniauth with mock credentials in development
2014-07-28 20:56:48 +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
Artem Chernikov
6e8d34f666 Merge pull request #375 from differentreality/typo
typo
2014-07-27 16:55:27 +02:00
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
4184396ca7 user omniauth with mock credentials in development 2014-07-25 18:48:04 +03:00
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
Artem Chernikov
5870838fc1 Merge pull request #366 from hennevogel/errbit-filter
Ignore more exceptions. Fixes #351
2014-07-24 17:37:03 +02:00
Christian Bruckmayer
501494d3f1 Merge pull request #371 from ChrisBr/fix_migration
Adds reset_column_information to add_events_per_week migration
2014-07-24 12:02:03 +02:00
Chrisbr
ea920b9915 Adds reset_column_information to add_events_per_week migration 2014-07-24 11:53:52 +02:00
Christian Bruckmayer
0ca590a2e2 Merge pull request #370 from ChrisBr/fix_migration
Assert event not deleted on add_events_per_week migration
2014-07-24 11:38:20 +02:00
Chrisbr
c05b428d8c Assert event not deleted on add_events_per_week migration 2014-07-24 11:05:03 +02:00
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
Henne Vogelsang
8112492a4b Ignore more exceptions. Fixes #351 2014-07-23 15:52:14 +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