Commit graph

192 commits

Author SHA1 Message Date
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference
#416
2014-08-18 14:33:02 +02:00
Stella Rouzi
7ebfbae7ab fix test 2014-08-15 20:45:29 +03:00
Stella Rouzi
79af7266ec Merge pull request #452 from differentreality/conference_view_test_edit
fix view test to search for input field with correct value
2014-08-15 20:38:44 +03:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Stella Rouzi
e9530dce9b fix view test to search for input field with correct value 2014-08-15 13:32:25 +03:00
Stella Rouzi
09dea4b4c5 fix typo openSUSE 2014-08-15 13:10:35 +03:00
Stella Rouzi
88f613ef8c Add controller tests for roles 2014-08-15 11:37:11 +03:00
Stella Rouzi
efc00787fc style fix 2014-08-14 20:18:38 +03:00
Stella Rouzi
7d35fc2857 fix test and add test for roles view 2014-08-14 19:58:50 +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
f5081813d9 fix from rebase
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
2014-08-13 22:53:14 +03:00
Stella Rouzi
f7ef401be7 style fixes 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
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
Stella Rouzi
e6cdb3a6ce style fix 2014-08-07 09:19:58 +03:00
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object
close #420
2014-08-06 14:30:50 +02:00
Henne Vogelsang
850beb72e1 Merge pull request #409 from hennevogel/refactor-conference-contact
Refactor conference contact
2014-08-06 11:56:14 +02:00
Gopesh Tulsyan
23c68211f0 Redirect to root path if splash is not public 2014-08-04 18:49:45 +05:30
Henne Vogelsang
5aa0d58c57 Move Conference contact details to Contact 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
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
Gopesh Tulsyan
f5c53f77cf Email notification on cfp dates updates and schedule made public 2014-07-26 11:15:37 +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
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
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
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
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
Gopesh Tulsyan
b504db3372 Added tests for emails views specs for addition of settings 2014-07-22 11:08:51 +05:30
Artem Chernikov
5289f41eb5 Use only new hash syntax 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
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
Henne Vogelsang
1d3c84c24d Make the spec aware of our new default event_types 2014-07-16 14:23:16 +02:00