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
2309 commits 15 branches 2 tags 50 MiB
Commit graph

197 commits

Author SHA1 Message Date
gotens1211
9c2a09eaf2 changed dropdown for small devices 2017-03-11 08:48:21 +05:30
gotens1211
db2d776c3b Sign in Ui improved in mobile 
hover fix for sign_in btn

improved osem-navbar.css.scss

removed class black
 2017-03-08 21:20:11 +05:30
hitman
226d16dc63 fix markdown issue 2017-03-06 20:57:04 +05:30
gotens1211
c1b81755c9 Implementing Countable.js to count words. 
Changed the words_count method to work with countable.js

Added the gem for countable.js
 2017-03-01 19:15:19 +05:30
gotens1211
82db583217 Default date removed from conference registrations. 2017-02-20 08:57:27 +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
desantonop
c0b7a70e6e Load template loads subject 
Change variable names in admin/emails#index to more descriptive ones. Geia soy Stella :*
Change attributes "data-name" to "data-body-input-id" and "data-template" to "data-body-text"
 2017-01-10 12:24:04 +02:00
Christian Bruckmayer
5f080cf6db Merge pull request #1134 from Ana06/all-events-links 
Make links inside event-panel work with ctrl+click
 2017-01-09 17:54:30 +01:00
Ana
cf5d4e4dbe Make links inside event-panel work with ctrl+click 
Function introduce to be used in links inside event-panel to make ctrl + click work.
 2016-12-30 13:36:05 +01: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
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog 
Changelog/Revision History page
 2016-08-15 14:16:12 +03:00
Rishabh Saxena
922440fb77 improve payment view styling 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
52c30af642 generalise application icon for Stripe iFrame 2016-08-15 10:59:34 +05:30
Rishabh Saxena
ab262ecb46 add payment views and styling 2016-08-15 10:59:34 +05:30
Christian Bruckmayer
72531c799a Merge pull request #1125 from Ana06/schedule-tags 
Schedule tags improved
 2016-08-12 11:53:05 +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
Christian Bruckmayer
3b1a474ee0 Merge pull request #1094 from Ana06/schedule-versioning 
Schedule versioning
 2016-08-12 09:56:31 +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
Ana
0e9b8b598f Use jquery-ui-rails gem 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
a1c7f67735 Render errors in JSON in the schedule correctly 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
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
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
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
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
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
96337ed081 Make the whole event panel clickable in all events 
Make the whole event panel clickable in all events in the public schedule. It didn't work properly when having links inside the panel.

It also works with ctrl + click openning the event page in a new tab.
 2016-08-11 11:19:05 +02:00
Ana
7f3ee13358 Schedule tags improved 
Schedule tags introduced in https://github.com/openSUSE/osem/pull/1082
improved.
 2016-08-07 21:49:35 +02:00
Henne Vogelsang
96155eb87f Merge pull request #1082 from nishanthvijayan/handle-cancelled-events 
Handle cancellation of scheduled events
 2016-07-25 15:52:53 +02:00
Henne Vogelsang
5edc6123f4 Merge pull request #987 from differentreality/blind_voting 
Blind voting
 2016-07-25 15:49:01 +02:00
Nishanth Vijayan
a071d4497b Handle cancelation of scheduled events 2016-07-25 17:34:06 +05:30
Henne Vogelsang
63750345e7 Merge pull request #1032 from Ana06/all-events 
All events grouped by date and time
 2016-07-25 11:47:28 +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
Ana
24364d0136 _all_events hamlfy 
_all_events changed to haml and margins moved inside the content of bootstrat cols
 2016-07-25 11:33:29 +02:00
Ana
70f30fcb1f Dropdown with date tags in all events 
Dropdown with date tags in all events of the schedule
 2016-07-25 11:33:28 +02:00
Ana
cc031b9f3a Unscheduled events added to all events 
Unscheduled events added to all events of the schedule
 2016-07-25 11:33:28 +02:00
Ana
69043e1549 All events grouped by date and time 
The events are ordered by date and time in the all events section of the schedule. The event schdule definition in program has been changed to order the events.
 2016-07-25 11:33:25 +02:00
Stella Rouzi
59eeb7edbd Enable blind voting 2016-07-22 12:21:54 +03:00
Ana
540e19e015 unused css removed 
osem-admin was not included in application.css neither in any other place, so it is not used. Some .css from osem-schedule-print do no exit since we merged https://github.com/openSUSE/osem/pull/1030
 2016-07-14 12:31:04 +02:00
Henne Vogelsang
ff025a4839 Fix the venue display on splash 2016-06-30 17:31:11 +02:00
Henne Vogelsang
5a0328842e Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page 2016-06-30 13:04:28 +02:00
Henne Vogelsang
5d5ad9348c Merge pull request #1034 from Ana06/statistic 
Statistics
 2016-06-30 12:25:59 +02:00
Ana
028d430885 Schedule height fits a 600px screen and the schedule is hiden if there is only one room 2016-06-27 18:24:47 +02:00
Ana
82c2c400b6 Swipe support added to the carousel 2016-06-27 18:16:13 +02:00