gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2157 commits 15 branches 2 tags 50 MiB
Commit graph

502 commits

Author SHA1 Message Date
gotens1211
4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop 
Cleared all the offenses for Style/SpaceAroundOperators

Added a description for the Style/SpaceAroundOperators Rubocop.
 2017-02-05 19:43:00 +05:30
Ana María Martínez Gómez
945b4aac60 Merge pull request #1249 from commandprompt/configurable_schedules 
implements configurable schedule granularity
 2017-02-01 15:41:28 +01:00
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
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
Ana María Martínez Gómez
4089f16f17 Merge pull request #1253 from differentreality/1113 
Rebases #1113
 2017-01-31 10:08:38 +01:00
Rishabh Saxena
241bc89293
repair code reviews 2017-01-29 10:50:43 +05:30
Ana María Martínez Gómez
45c3c73e57 Merge pull request #1255 from shlok007/display-paid-and-unpaid-tickets 
Display paid and unpaid tickets in admin/tickets#show
 2017-01-26 16:27:24 +01:00
shlok007
d974807134 Display paid and unpaid tickets in admin/tickets#show 2017-01-23 22:37:57 +05:30
Nishanth Vijayan
5111d9e937 Extract checking if event is replacement to event_schedule model 2017-01-20 18:54:56 +02:00
Rishabh Saxena
e0d5b461b3
rubocop: annotate exceptions 2016-12-20 17:21:50 +05:30
Rishabh Saxena
fe828d24db
conference: refactor code and tests 2016-12-20 17:21:50 +05:30
Rishabh Saxena
53291e25b5
automatically create free ticket with new conf 2016-12-20 17:21:49 +05:30
Rishabh Saxena
4dcfc55418
add ability to create and purchase free tickets 2016-12-20 17:21:48 +05:30
differentreality
ea868d4cc7 voting period is open when voting dates are not set 2016-11-24 19:09:35 +02:00
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
7d70f7685e Track Schedule and EventSchedule 2016-09-26 17:21:45 +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
c48c8afa51 Merge pull request #1161 from Ana06/room-event-schedule 
Delete EventSchedules when a Room is deleted
 2016-09-06 12:47:51 +03:00
Ana
c5c7cbeab9 Delete EventSchedules when a Room is deleted 
We should remove all the EventSchedules that belongs_to a Room when it is deleted. Otherwise both the public and admin schedule would fail.
 2016-08-18 16:19:15 +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
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
Christian Bruckmayer
6c2dc92b84 Merge pull request #1148 from Ana06/event-schedule-validation 
Validation in EventSchedule
 2016-08-15 16:28:39 +02:00
Ana
f0a7f3c59b Validation in EventSchedule 
Validation to avoid scheduling the same event twice for the same schedule.
 2016-08-15 16:10:57 +02:00
Nishanth Vijayan
e2659ae907 Show changes to event commercials in event changelog 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
da1c8fc691 Allow cfp team members to revert changes to events through event#history-content 2016-08-15 18:18:03 +05:30
Rishabh Saxena
a78804b94d add more tests to check Stripe exceptions 2016-08-15 10:59:36 +05:30
Rishabh Saxena
5c21d1c4d9 add Payment#purchase tests 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
e2d42fbbbb modify ticket and ticket_purchases models 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
Rishabh Saxena
ee0a575a6f add payment model and its associations 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
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
Ana
b037a5eb7c Load and authorize schedule in ScheduleController 2016-08-11 15:11:27 +02:00
Ana
3897ec79ca Repeated sentence moved to a function 
program.selected_schedule.event_schedules.order(start_time: :asc) was repeated several times and it has been moved to conference#selected_event_schedules
 2016-08-11 15:11:27 +02:00
Ana
beb17165a2 Introduce an association for the selected_schedule 
Association in Program fot the selected_schedule
 2016-08-11 15:11:27 +02:00
Ana
0b26ed5c35 EventSchedule validations 
event, schedule, room and start_time are mandatory in EventSchedule.
 2016-08-11 15:11:27 +02:00
Ana
354e15a76d Public schedule adapted to the new relations 
Public schedule and all events adapted to the new relations and models to allow having several schedules in the admin shcedule.
 2016-08-11 15:11:27 +02:00
Ana
dfd64a4510 Integrate the schedule in the admin interface 
Integrate the schedule in the admin interface while adapting it to the new associations and models.
 2016-08-11 15:06:52 +02:00
Ana
c047ffd699 New associations and models: schedule versioning 
For the schedule versioning in the admin interface (having multiple possible shcedules) we need to change some models and associations. It has also been create a rake:move_events_attributes task to migrate the data.

User Interface addapted to make use of the introduced associations and models
 2016-08-11 15:06:52 +02:00