Commit graph

354 commits

Author SHA1 Message Date
Henne Vogelsang
54609cabcf
Prepare settings for new deployment 2017-06-01 15:39:45 +02:00
AEtherC0r3
9341edd9cb Change mock accounts credentials
The names and usernames don't follow a canonical pattern
And the emails point to a valid domain not owned by osem and not
reserved for illustration purposes

Normalize the users' names and usernames and change the domain of the
email addresses to example.com

Fix #1365
2017-05-06 10:37:58 +03:00
Ana María Martínez Gómez
f3e712a1bc Merge pull request #1319 from JewelSam/master
#1220 adding the cell size attribute to the database
2017-04-03 10:23:49 +02:00
JewelSam
f6e74461ba Add schedule interval as attribute of a program
Also, the part of the schedule event is deleted and the length of the event types
changes to the nearest suitable after changing the length of the interval.

This closes #1220
2017-04-01 21:39:20 +03:00
nasia
962bbaedb2 Fix dublicated routes 2017-03-31 15:48:44 +03:00
Stella Rouzi
5e9bc683ae Move reports to separate controller 2017-03-20 17:51:37 +02:00
Chaitanya
123c9f6a6f Add mock_auth config for Github 2017-03-13 18:48:41 +05:30
Christian Bruckmayer
7844554817 Merge pull request #1193 from kormoc/contributing_updates
Minor Contributing documentation updates.
2017-03-02 14:07:19 +01:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
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
Rob Smith
0dba45909f Minor Contributing documentation updates.
These are small things I had to change to have the vagrant environtment work
correctly.
2016-09-17 19:31:59 -07:00
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