gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-16 05:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1989 commits 15 branches 2 tags 50 MiB
Commit graph

111 commits

Author SHA1 Message Date
Christian Bruckmayer
72531c799a Merge pull request #1125 from Ana06/schedule-tags 
Schedule tags improved
 2016-08-12 11:53:05 +02:00
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
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
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
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
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
Aditya Prakash
8da80f28e2 Add pop up modal for sponsor 2016-04-21 19:51:24 +05:30
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
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
David Sedeño
1efdcdc4cf Fix gradient in schedule page in Firefox. fix #748 2016-02-20 23:10:27 +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
Christian Bruckmayer
a80e3d814e Merge pull request #656 from bgeuken/make_schedules_links 
Make talks on schedules table real links
 2015-06-15 22:06:33 +02:00
Stella Rouzi
93bbd0ea0d td width with col-md 2015-06-11 13:31:03 +03:00
Björn Geuken
02e6f78153 Handle talks on the scheduler table as links 
Previously the link functionality (open in window or tab) of those talks was
done via javascript. Because of that they couldn't be selected via right click
to be opened in a tab, copied or bookmarked.

By embedding the talk items into a link element and adding some css to hide
the link effects, like hover and underline, we get the desired behaviour
without changing it's appearance.
 2015-05-15 17:52:51 +02:00
Henne Vogelsang
e8ab94e1c7 Implements sign up during registration. Solves most of #215 2015-03-12 23:53:57 +01:00
Shayon Mukherjee
54bcc89204 Refactored nested comments. Now using partial to load them 2015-02-27 12:29:18 -06:00
Stella
44f693a093 fix height of switch 2015-01-21 17:28:18 +02:00
Stella Rouzi
a845dd5d7d add bootstrap-switch for is_highlight 2015-01-21 17:28:18 +02:00
Henne Vogelsang
c6bd65deaa Fix Stellas review gripes 2014-12-09 15:19:01 +01:00
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +01:00
Henne Vogelsang
60bb00b88e Fix glyphicons, suse-icon and remove unused fonts 2014-11-27 14:47:00 +01:00
Henne Vogelsang
b6b0c104fd Mobile fixes for the splash 2014-11-20 16:52:55 +01:00
Henne Vogelsang
cb227a0afc Another round of splash design 
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
 2014-11-20 15:39:26 +01:00
Henne Vogelsang
30e8ab856c Get rid of the splashpage banner photo and "descriptions" 2014-11-20 15:39:26 +01:00
Henne Vogelsang
f2cdea4f1a Integrate the splash page into the general layout 
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
 2014-11-17 13:58:27 +01:00
Henne Vogelsang
7acd16f923 We need glyphicons for the bootstrap-markdown editor 2014-11-17 13:56:00 +01:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
Stella Rouzi
561a040c72 remove jquery-fileupload-rails 2014-08-21 07:58:26 +03:00