Commit graph

244 commits

Author SHA1 Message Date
Eugene Dubinin
ff9ca4a817 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens 2017-01-31 16:24:45 +02:00
Stella Rouzi
46101228e7 Merge pull request #1169 from nishanthvijayan/reports
Add new page with organizer reports
2017-01-15 12:28:38 +02:00
Christian Bruckmayer
bb0639df14 Merge pull request #1175 from shlok007/replace-quiet-assets
using sprockets-rails instead of quiet-assets
2016-12-19 17:14:04 +01:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Nishanth Vijayan
fabe29d2ed Add new page with organizer reports 2016-09-27 21:24:49 +05:30
shlok007
9ace40d9fc using sprockets-rails instead of quiet-assets 2016-08-27 19:40:53 -04:00
Hernan Schmidt
1eaf810548 In Travis, run tests on MariaDB 2016-08-22 16:39:19 +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
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
Rishabh Saxena
75e11223d2 spec/feature: add stripe integration tests 2016-08-16 00:46:11 +05:30
Rishabh Saxena
05e2a061cc add stripe key to development env 2016-08-15 10:59:35 +05:30
Rishabh Saxena
048f20bcfc fix typo. change secrets.yml config. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
a9ab1186f8 change rails initialisation.
repair abilities. add ticket purchasing check.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
47e16e5653 add stripe gateway config 2016-08-15 10:59:34 +05:30
Rishabh Saxena
8f39fc83d2 add resource, ability and controller for payments 2016-08-15 10:59:33 +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
c469f4f415 Event schedule controller pluralized 2016-08-11 15:11:27 +02:00
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
5001848af7 Introduce an Admin::EventScheduleController
- move SchedulesController#update action
- split it into an #create/#update and #destroy action and use these actions in the JS code
2016-08-11 15:11:27 +02:00
Ana
71dab6b79c SchedulesController introduced
The actions #schedule and #events were moved from conference controller to the new controller
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
Ana
6d9eabcc0e All events moved to a different controller method
All events moved to a different controller method and css changed to put together things with the same css attributes.
2016-07-25 11:33:30 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Nishanth Vijayan
740c57f0ad Remove routes of Speakers,People and Photos controllers 2016-05-27 01:22:41 +05:30
Henne Vogelsang
a3dd8e6c95 Use config/database.yml for ClearDB config
If we use .env heroku neither sees DATABASE_URL nor
config/database.yml and assumes we use postgre. There
also is no need to load the rails env in the task.
2016-05-25 16:49:56 +02:00
Henne Vogelsang
30e10a4e40 Fix program routing outside of Admin
We don't have ProgramsController so we can't have routes
for it
2016-05-23 15:18:25 +02:00
Nishanth Vijayan
d152b5eddc Update paper_trail gem to latest 2016-05-18 23:27:18 +05:30
Henne Vogelsang
be2221c57a Include .env.production in deploy 2016-05-09 14:47:29 +02:00
Henne Vogelsang
1fd029cb66 Mention the data:migrate:config2dotenv during boot 2016-04-29 17:07:50 +02:00
Henne Vogelsang
14a9d701f7 If operating on a env variable make sure its there
Fix booting the app without OSEM_SMTP_AUTHENTICATION set
2016-04-29 16:37:48 +02:00
Henne Vogelsang
f97e271566 Fix some typos 2016-04-29 16:37:48 +02:00
Henne Vogelsang
5b0202c052 Expand and document SMTP configuration 2016-04-29 16:37:48 +02:00
Henne Vogelsang
beac27405e Use the environment for ActionMailer configuration 2016-04-29 16:37:48 +02:00
Henne Vogelsang
fee8adba4b Also set a default secret_key_base in test env 2016-04-29 16:36:47 +02:00
Henne Vogelsang
64830e9cff Don't read config.yml anymore
add some heroku support gems and document all the new variables
2016-04-29 16:36:47 +02:00
Henne Vogelsang
ebcb2780cd Configure OSEM via environment variables
Instead of reading a yaml file we get configuration from the
environment.
2016-04-29 16:36:47 +02:00
Henne Vogelsang
45c31f210f Drop config/config.yml.example. Not needed anymore
Also make config/secrets.yml.example read a bit nicer
2016-04-29 16:36:47 +02:00
Henne Vogelsang
8fc57e34c9 Adapt the spec 2016-04-27 17:55:24 +02:00
Henne Vogelsang
de486dc621 Oh My God. Close your eyes!
Someone used a paperclip method in a migration. I'm too scared to
look who, maybe it was me?
2016-04-27 17:55:24 +02:00
Henne Vogelsang
cea9081347 A paperclip compatible carrierwave uploader 2016-04-27 17:40:23 +02:00
Henne Vogelsang
1ce834391a Add cloudinary gem, fix some Gemfile comments 2016-04-27 11:48:12 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03: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
1fdc2f8efe Merge pull request #946 from Shriyanshagro/venue_commercial
Defined Venue has_one Commercial nice new relationship
2016-04-26 14:32:54 +02:00
Henne Vogelsang
21280cd9d8 Switch mail sending to active_job
Before we were using the delayed_job method of delaying
mail sending which isn't working anymore on rails 4.
2016-04-20 18:59:24 +02:00
Shriyansh
6f667a865b create_venue_commercial added 2016-04-10 11:57:30 +05:30
Shriyansh
154f4a400c venue_commercial association establihed 2016-04-10 11:57:30 +05:30
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Aditya Prakash
9abda59b0d Add configuration and documentation smtp setting 2016-04-07 13:49:28 +05:30
Henne Vogelsang
f56fc0052f Merge pull request #907 from sonalkr132/proposal-test
Proposal controller improvements and test
2016-04-01 14:49:50 +02:00