gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2145 commits 2 branches 2 tags 50 MiB
Commit graph

498 commits

Author SHA1 Message Date
Ana María Martínez Gómez
24582706be Merge 37edffe7de into 45c3c73e57 2017-01-26 15:36:04 +00: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
Ana
bcff982d3d Introduce bulk :create, :update and :destroy 
Introduce bulk :create, :update and :destroy actions to avoid doing several request in the admin schedule.
 2017-01-12 11:49:35 +01:00
Ana
6f0cdc64c3 Introduce a "Save" button for the admin schedule 
The changes were saved after you drop an event, and now it only saves the schedule when you're done with the changes and click the "Save" button.
 2017-01-12 11:37:38 +01:00
Christian Bruckmayer
c4938166f5 Merge pull request #1228 from Ana06/fix_multichoice 
Fix multiple choice questions
 2016-12-19 17:40:38 +01:00
Ana María Martínez Gómez
50410f6e4f Fix multiple choice questions 2016-12-15 11:50:23 +01:00
Rishabh Saxena
e07bdee7c1
hakiri: fix security issue 2016-11-22 09:58:20 +05:30
AnithaPal
68d447f023 added events, confirmed events and events with comments export features with xlsx, pdf and csv format 2016-10-19 10:48:58 -04:00
AnithaPal
3da3fcccbb exporting events to pdf, excel, and csv format 2016-10-19 10:48:39 -04:00
Stella Rouzi
7cc2609662 Merge pull request #1189 from kormoc/support_jsonp_in_api 
Support JSONP callbacks for the API/v1 endpoints
 2016-10-17 23:35:20 +03:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Nishanth Vijayan
d954059947 Show missing speakers in reports 2016-09-28 03:03:01 +05:30
Nishanth Vijayan
fabe29d2ed Add new page with organizer reports 2016-09-27 21:24:49 +05:30
Ana
7f843a3a13 Remove unnecessary code from conference_controller 
Remove unnecessary code from conference_controller#update.
 2016-09-26 13:36:44 +02:00
Rob Smith
de4563ddb1 Remote forgery protection for json requests to the api/v1 endpoints 
Due to my testing, I incorrectly removed the forgery protection
skip action from the controllers in the api. This fixes that and allows jsonp
calls to work correctly
 2016-09-17 19:31:22 -07:00
Rob Smith
70e0f42bbb Support JSONP callbacks for the API/v1 endpoints 
SeaGL currently uses OSEM as a backend, but still has a static website
serving as our public interface. The API endpoints have a great amount
of data, but without the jsonp callback paramater, embedding the data
is a bit difficult. This change just adds the jsonp callback param
to all the API endpoints. This should be a NOOP for anyone using direct
json calls, but will allow cross domain requests that require jsonp.
 2016-09-17 19:31:21 -07:00
Nishanth Vijayan
2785902dba Remove ununsed code from events_controller#index 2016-08-19 00:01:50 +05:30
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
Stella Rouzi
99992750bb Merge pull request #1128 from nishanthvijayan/event-changelog 
Improve event history page
 2016-08-16 18:23:56 +03:00
Nishanth Vijayan
a02060b665 cfp team users should have access to event commercials only 2016-08-16 18:56:54 +05:30
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
Nishanth Vijayan
e2659ae907 Show changes to event commercials in event changelog 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
c80f37f3ff Change look of event history page similar to changelog 2016-08-15 16:48:10 +05:30
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog 
Changelog/Revision History page
 2016-08-15 14:16:12 +03:00
Rishabh Saxena
164101f2fe change "purchase" to "get" in views 2016-08-15 10:59:36 +05:30
Rishabh Saxena
261d7dd0de improve flash error collection 
improve views
 2016-08-15 10:59:36 +05:30
Rishabh Saxena
4b0a5b1125 move params merge to private method 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
72ef33cbe6 remove stripe#customer creation. 
remove amount validation.
 2016-08-15 10:59:35 +05:30
Rishabh Saxena
112d2c6fff change camel case variable to ruby style. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
1f9338735c improve Stripe error rescue. modify tests. 2016-08-15 10:59:34 +05:30
Rishabh Saxena
be6d046154 move stripe API call to model, schema changes 2016-08-15 10:59:34 +05:30
Rishabh Saxena
1894cea975 modify ticket purchases view 2016-08-15 10:59:33 +05:30
Rishabh Saxena
92dc0edff2 modify registration view and controller 2016-08-15 10:59:33 +05:30
Rishabh Saxena
8f39fc83d2 add resource, ability and controller for payments 2016-08-15 10:59:33 +05:30
Ana
1636b458ee Inform that there are no rooms in the schedule 
Inform that there are no rooms when creating the schedule with a message instead of creating a room with the title "No rooms". The message also include a link to the place where rooms are created.
 2016-08-12 11:33:49 +02:00
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
a1c7f67735 Render errors in JSON in the schedule correctly 2016-08-11 15:11:27 +02:00
Ana
e8261d41bc Improve Error messages 
- Improve error messages in event schedules, schedules and program controller.
- Two respond_to blocks in the update method of program controller.
 2016-08-11 15:11:27 +02:00
Ana
5761e0f7a4 Using flash instead of alerts in the schedule 
Using flash instead of alerts in the schedule to notify errors.

Also, a message shown when a schedule is successfully created.
 2016-08-11 15:11:27 +02:00
Ana
81108290e5 Schedule update moved to program update 
Schedule update updated a program attribute
 2016-08-11 15:11:27 +02:00
Ana
310c521790 EventSchedulesController when something goes wrong 
Consider that create, update or destroy can fails in EventSchedulesController

Params in remove deleted because they were not used
 2016-08-11 15:11:27 +02:00
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
2e1cd164a4 Load event schedule fixed 
It was needed to use the id instead of the guid in the html attributes of the events in the admin schedule
 2016-08-11 15:11:27 +02:00
Ana
a578167cf5 Event model improvements 
- Drop selected_event_schedule function
- Rename scheduled_room and scheduled_start_time to room and time as if there is no selected_schedule, the event is not scheduled.
 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
a394293500 Do not use JS to initialize the schedule 
- Only use JS for the drag&drop functionality and to the set/alter the time and rooms of the EventSchedule object.

- Introduce has_many :events, through: :event_schedules association to get unscheduled event easily
 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