Commit graph

179 commits

Author SHA1 Message Date
nasia
a6e8283bcf Fix commercial option for users in dashboard#show #1390 2017-04-24 10:16:39 +03:00
shlok007
f04c7a7cab improved features/ability_spec.rb 2017-04-14 14:51:21 +00:00
Stella Rouzi
92cb010cc6 Merge pull request #1448 from nasia-sam/cfp_access_to_schedule
Add permission to access admin/shedule by cfp #1432
2017-04-14 17:14:21 +03:00
nasia
11938025cf Add permission to access admin/shedule by cfp#1432 2017-04-13 20:45:19 +03:00
Ana María Martínez Gómez
46a6a59622 Merge pull request #1430 from codyborders/master
Adds Style/Tab cop to rubocop.yml
2017-04-07 18:50:22 +02:00
Ana María Martínez Gómez
fd6d0bf39b Merge pull request #1446 from sunny-b/master
Enable Style/DotPosition Rubocop cop
2017-04-07 11:21:34 +02:00
Sunny
03fa299058 enable style/dotposition rubocop cop 2017-04-06 23:19:58 -04:00
Cody Borders
535b3f86d6 Fixes Style/Tab cops
Removes exclusions for Style/Tab cops in rubocop_todo
Places Style/Tab cop in appropriate alphabetical order
All cops now fixed.
2017-04-06 10:57:44 -06:00
gotens1211
eb1e8ed238 Changed the default state of components in splashpage to selected
Mark the splashpage components to checked for the new action, also modified the display changes in splashpages test

Fixes #1340
2017-04-05 17:11:11 +05:30
Siddhant Bajaj
e8aa7c8a98 Fixed Venue link in todo list for organiser
"Add venue" link in todo list is not active for the organiser of that
conference. Fixes #1383
2017-03-26 00:25:44 +05:30
Stella Rouzi
8fb29972da Merge pull request #1268 from shlok007/tests
Added feature tests for Roles
2017-03-21 13:13:15 +02:00
shlok007
dc41daae97 added feature test for roles 2017-03-05 11:21:31 +05:30
shlok007
1ca3147ae0 add resources test in features/ability_spec.rb 2017-02-21 02:01:35 +05:30
shlok007
6db2e8abe7 remove input field from admin/resource#index 2017-02-09 01:11:24 +05:30
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Hernán Schmidt
a4ef10cf1b Merge pull request #1118 from rishabhs95/free-ticket
ability to create and purchase free tickets
2017-01-31 14:54:18 +01:00
AEtherC0r3
ca442dcb90 Amend version tests to show correct event name
Add scenario for votes
2017-01-10 23:51:32 +02:00
Rishabh Saxena
b9b7a4d97d
remove tickets testing ambiguity 2016-12-20 17:21:50 +05:30
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