mirror/osem
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-04-25 01:07:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,989 Commits 16 Branches 2 Tags
e2d42fbbbbdd0ef6bc8716f29547d34e1e65c331
Commit Graph

1989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rishabh Saxena
e2d42fbbbb modify ticket and ticket_purchases models 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
Rishabh Saxena
ee0a575a6f add payment model and its associations 2016-08-15 10:59:33 +05:30
Rishabh Saxena
b639d2eec5 add stripe-gem and payment schema 2016-08-15 10:59:33 +05:30
Henne Vogelsang
2b4bf2fff7 Merge pull request #1138 from charliequinn/increase-tests-conference-registrations-controller 
Specs added ConferenceRegistrationsController#new
 2016-08-12 13:42:24 +02:00
Christian Bruckmayer
308c15f0ff Merge pull request #1127 from Ana06/markdown 
Markdown
 2016-08-12 11:55:05 +02:00
Christian Bruckmayer
72531c799a Merge pull request #1125 from Ana06/schedule-tags 
Schedule tags improved
 2016-08-12 11:53:05 +02:00
Christian Bruckmayer
56f09474eb Merge pull request #1104 from Ana06/integrate-schedule 
Inform that there are no rooms in the schedule
 2016-08-12 11:49:46 +02:00
Ana
eee4e4f22c Add markdown to users biography 
Closes https://github.com/openSUSE/osem/issues/1090
Closes https://github.com/openSUSE/osem/issues/701
 2016-08-12 11:38:28 +02:00
Ana
72cd463dc7 Add markdown to events abstract 2016-08-12 11:38:28 +02:00
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
Christian Bruckmayer
60877e9593 Merge pull request #1141 from ChrisBr/update_rails 
Update rails to version 4.2.7.1
 2016-08-12 09:56:50 +02:00
Christian Bruckmayer
3b1a474ee0 Merge pull request #1094 from Ana06/schedule-versioning 
Schedule versioning
 2016-08-12 09:56:31 +02:00
Christian Bruckmayer
20dd33d2ff Update rails to version 4.2.7.1 2016-08-12 09:43:05 +02:00
Christian Bruckmayer
02b287d398 Merge pull request #1139 from Ana06/css-removed 
Restore css removed
 2016-08-12 09:28:35 +02:00
Ana
d1392c1cba Restore css removed 
Restore css which was removed in https://github.com/openSUSE/osem/pull/1132 as it is used in the public schedule.
 2016-08-12 01:23:54 +02:00
charliequinn
df8517b011 Specs added ConferenceRegistrationsController#new 
- Increased test coverage with addition of specs to cover :new method of
  ConferenceRegistrationsController
 2016-08-11 23:54:21 +01:00
Ana
0e9b8b598f Use jquery-ui-rails gem 2016-08-11 15:11:27 +02:00
Ana
1989a33da1 Test namings 
Test namings in event_schedules and schedules controllers.
 2016-08-11 15:11:27 +02:00
Ana
aebd5f20a1 Remove unnecessary attributes in osem-schedule.js 
Remove unnecessary attributes (schedule and event id) in osem-schedule.js used for update an event.
 2016-08-11 15:11:27 +02:00
Ana
8975df6a6b Event schedules controller tests improved 2016-08-11 15:11:27 +02:00
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
c687c1072e Add event schedules and schedules controller specs 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
13bcee485e Has a valid factory test for event schedule 
Has a valid factory test introduced for event schedule
 2016-08-11 15:11:27 +02:00
Ana
c469f4f415 Event schedule controller pluralized 2016-08-11 15:11:27 +02:00
Ana
33e9c86214 Selected_scheduled? helper added 
To be used in Schedules#index
 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
57d2a05b7f Use of Rails usl helper instead of interpolation 
I also eliminated a duplicated attribute in params
 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
Ana
b037a5eb7c Load and authorize schedule in ScheduleController 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
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
3f114629f9 javascript for the admin schedule moved to a .js 
Inline javascript for the admin schedule moved to a dedicated .js file.
 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
e7a30302ff Tests for the new associations and models 
Tests for the schedule versioning 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
Stella Rouzi
e34a1904e0 Merge pull request #1132 from Ana06/all-events-links 
Make the whole event panel clickable in all events
 2016-08-11 13:20:46 +03:00