Commit graph

165 commits

Author SHA1 Message Date
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
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
Ana
53b02d6a74 Adapting number of columns in the carousel schedule taking screen width into account 2016-06-27 18:16:13 +02:00
Ana
d8f9de9363 new schedule 2016-06-27 18:16:13 +02:00
Ana
1d7f3207a6 Registrations dashbox eliminated from registrations 2016-06-25 15:36:33 +02:00
Arun
a56b992905 Make thumbnails responsive 2016-06-22 04:36:56 +05:30
Arun
0d6a2e668c Add fallbacks for venue commercial 2016-06-20 23:23:42 +05:30
Stella Rouzi
2b1aeafcd8 javascript load for user_biography 2016-05-01 19:16:19 +03:00
Ana
22916971c7 Word limit on user biography changes 2016-04-27 00:28:31 +02:00
Aditya Prakash
8da80f28e2 Add pop up modal for sponsor 2016-04-21 19:51:24 +05:30
Henne Vogelsang
2e79f65989 Merge pull request #939 from Shriyanshagro/datepicker_constraints
Defined DateTimepicker constraints
2016-04-20 16:19:41 +02:00
Alexandros
b7bba4ba44 Groom proposal#show for issue openSUSE/osem#731
Move speaker's avatar and bio to the sidebar and move proposal's information bellow the commercial.
2016-04-15 00:24:18 +03:00
Aditya Prakash
34892d04c8 Remove unused assets of datatables
jquery-datatables-rails gem provides all these resource.
Remove javascript was unused code since d21e19b9.
2016-04-10 13:49:46 +05:30
Shriyansh
b6083d836d defined constraints for dateTimePicker 2016-04-09 21:03:31 +05:30
Rishabh Saxena
99afc456cd correcting ticket's details view and its related models. 2016-03-19 01:52:38 +05:30
Rishabh Saxena
d06a77ae76 enabling state save feature in datatables 2016-03-15 19:08:57 +05:30
Henne Vogelsang
97ca07d142 Merge pull request #841 from chocoelho/unset_footer_fixed_height
Unset footer fixed height
2016-03-09 11:47:26 +01:00
Nishanth Vijayan
64b825cebe Fix markdown editors bug #811 using asset gem. 2016-03-08 16:50:30 +05:30
Carlos Coelho
0336171e4a Unset footer fixed height
If footer is set to a fixed height, it makes some white block
between footer and bottom of page.

Its height should be resized according to footer content.

Related to #840

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
2016-03-06 22:20:13 -03:00
Stella Rouzi
18bb1bd237 Merge pull request #770 from hennevogel/feature_venue_show
Beautify venue#show
2016-03-04 19:44:49 +02:00
Henne Vogelsang
af168f0f55 Merge pull request #700 from differentreality/roles_updated
Roles updated
2016-03-04 17:11:56 +01:00
Henne Vogelsang
f83e76102f Make use of holder.js in venue#show 2016-03-04 15:59:17 +01:00
Henne Vogelsang
46237a936a Merge pull request #787 from davidsf/fix_schedule_in_firefox
Fix gradient in schedule page in Firefox
2016-03-03 16:41:55 +01:00
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Aditya Prakash
0c6075dcc7 DRY datepicker function call 2016-02-29 16:54:51 +05:30
Aditya Prakash
04d5216c38 Allow selection of future dates on registration period page
close: #798
2016-02-29 16:28:09 +05:30
Aditya Chatterjee
f57edd1e35 Deleted d3_rails gem 2016-02-27 18:01:38 +05:30
David Sedeño
1efdcdc4cf Fix gradient in schedule page in Firefox. fix #748 2016-02-20 23:10:27 +01:00
Henne Vogelsang
09ec76a130 Switch javascript assets to rails-assets.org 2016-02-08 13:53:06 +01:00
chrisbr
23664119bd Implement simplified commercials workflow
It's now possible to simply enter the url of the third party provider to enter a commercial.
2016-01-21 19:41:12 +01:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03:00
raluka
1cf877bf76 grooming style 2015-10-05 13:28:35 +02:00
raluka
f7c70ba55c updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper 2015-09-21 15:56:57 +02:00
Stella Rouzi
8567a997cb Merge pull request #679 from differentreality/switch
Rework bootstrapSwitch
2015-07-02 13:08:16 +03:00