Commit graph

161 commits

Author SHA1 Message Date
Rishabh Saxena
b36d4e98e2
ticket_purchase_controller: free ticket routing 2016-12-20 17:21:49 +05:30
Rishabh Saxena
b28be23284
spec/ticket: add tests for purchasing free tickets 2016-12-20 17:21:49 +05:30
Rishabh Saxena
b2f75dd907
spec/tickets: add tests for free ticket creation 2016-12-20 17:21:49 +05:30
Stella Rouzi
6c39d34322 Merge pull request #1159 from nishanthvijayan/changelog-improvements
Misc improvements to Revision History
2016-11-21 19:21:02 +02:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Rishabh Saxena
d1c0c7d97a
registration#delete: retain ticket purchases 2016-09-26 20:57:11 +05:30
Nishanth Vijayan
b982d18bbb Use name/title instead of ID for associated object when showing changes 2016-09-26 17:21:45 +05:30
Stella Rouzi
46774748ba Merge pull request #1114 from nishanthvijayan/event-missing-info
Show Event missing info in admin
2016-08-26 18:42:59 +03:00
Hernan Schmidt
393deefcf9 Use a css regex matcher to find campaign entries 2016-08-22 11:23:18 +02:00
Nishanth Vijayan
48828f8930 Display who added commercial for event
Activate versioning for tests

The tests were failing because of the lack of versioning.By default, versioning is off for tests.
As a result, here (app/views/proposal/_form.html.haml L43) commercial,versions.last returns nil as there are no versions.
2016-08-20 14:21:21 +05:30
Hernan Schmidt
9eb4ac2738 Fix campaign features to work with MySQL 2016-08-18 18:32:41 +02:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe
Online payment feature - direct stripe integration
2016-08-18 16:04:11 +02:00
Rishabh Saxena
4152cb242c run stripe feature test only if key is set 2016-08-17 23:57:40 +05:30
Rishabh Saxena
cc09dd76ba support/external_request: only allow stripe 2016-08-17 12:25:49 +05:30
Rishabh Saxena
43ac7742a1 travis: provide Stripe API keys 2016-08-16 23:01:28 +05:30
Rishabh Saxena
75e11223d2 spec/feature: add stripe integration tests 2016-08-16 00:46:11 +05:30
Rishabh Saxena
6bd2e5e335 refactor tests 2016-08-15 10:59:36 +05:30
Rishabh Saxena
a78804b94d add more tests to check Stripe exceptions 2016-08-15 10:59:36 +05:30
Rishabh Saxena
a5bb038f61 modify tests for changed payment flow 2016-08-15 10:59:34 +05:30
Nishanth Vijayan
fb03a87a87 Feature test for Revision History 2016-08-12 13:35:56 +05:30
Nishanth Vijayan
a45e537bac Setup basic Revision History page
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
2016-08-12 13:35:56 +05:30
Ana
29b920d746 Corrections in SchedulesController
- Controler file name pluralized
- Load and authorization fixed and improved
- Consider that save can fail in create action
- Eliminate unnecessary if in update action
- Ability and tests related to the schedules link in the admin sidebar fixed
2016-08-11 15:11:27 +02:00
Ana
42848f929b Several schedules in the backend && routes changed
- Introduce plural resources for Schedule in routes.rb
- Introduce #index and #create actions for ScheduleController
- Make it possible to set a schedule as selected_schedule
2016-08-11 15:11:27 +02:00
Christian Bruckmayer
28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color
Different colors for new tracks, types and levels
2016-07-11 15:10:26 +02:00
Ana
8d9bb56f06 Hexadecimal color changed to capital letters
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
2016-07-11 13:46:02 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Rishabh Saxena
c802bd95b9 change datepicker id to place correct constraints 2016-06-15 20:48:55 +05:30
Christian Bruckmayer
406e37a1d8 Adapt ability to allow proposal creation if cfp is open
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
2016-05-19 11:47:41 +02:00
Henne Vogelsang
45bd31fad0 Escape HTML some factory strings 2016-05-03 16:25:07 +02:00
Henne Vogelsang
73ce49de25 Use dynamic fake data in the spec 2016-05-02 16:06:32 +02:00
Henne Vogelsang
8fc57e34c9 Adapt the spec 2016-04-27 17:55:24 +02:00
Henne Vogelsang
aabbd35063 Merge pull request #932 from hennevogel/bugfix_email_settings
Fix email notifications
2016-04-26 14:33:43 +02:00
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +02:00
Nishanth Vijayan
ab339fadb0 Fix typos: volunteer_coordinator to volunteers_coordinator 2016-04-09 03:50:27 +05:30
Henne Vogelsang
be42215003 phantomjs doesn't like color pickers... 2016-04-05 14:45:47 +02:00
Nishanth Vijayan
ead39ebacf Add tests to check commercials #create,#update fails on invaid data 2016-04-01 00:34:39 +05:30
Aditya Prakash
eae6d90e9f Fix authorization of new and create in ConferenceRegistrationsController
Before authorization we need to set conference relation.
Change in proposal spec cause conference has to have valid registration
period for successful redirect to registration after confirm proposal.
2016-03-23 21:30:05 +05:30
Aditya Prakash
d2b392e119 Remove assumption from test that first user is admin 2016-03-14 17:29:35 +05:30
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Stella Rouzi
f567187d45 Add validations for registration_period 2016-02-23 12:57:45 +02:00
Henne Vogelsang
919c69f7ae Fix new rubocop offense 2016-02-08 14:57:23 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
Christian Bruckmayer
9e9c536946 Update rails to version 4.2
Furthermore it was necessary to add the following gems:
- responders
- web-console

And additional it was necessary to update these gems manually:
- devise
- turbolinks
- delayed_job_active_record
- money-rails

And the corresponding dependencies.
http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-4-1-to-rails-4-2
2016-01-26 10:04:08 +01:00
Christian Bruckmayer
28e55f3f50 Merge pull request #737 from ChrisBr/commercial_new
Simplify adding commercials to conference and event
2016-01-21 20:29:03 +01:00
chrisbr
23664119bd Implement simplified commercials workflow
It's now possible to simply enter the url of the third party provider to enter a commercial.
2016-01-21 19:41:12 +01:00
Stella Rouzi
17a1c0e87c fix hakiri issue 2016-01-21 20:19:37 +02:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
9eb47bd3f0 merged from upstream 2015-10-14 16:02:40 +02:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00