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

1942 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Stella Rouzi
424b1302cb Merge pull request #1126 from Ana06/unless 
Do not use unless with else
 2016-08-09 13:21:17 +03:00
Ana
c1334e59cc Do not use unless with else 
Solve Rubocop offense introduced in https://github.com/openSUSE/osem/pull/1123
 2016-08-08 23:57:03 +02:00
Christian Bruckmayer
859b3beda6 Merge pull request #1123 from Ana06/if_not 
style: if ! changed by unless
 2016-08-08 14:07:05 +02:00
Christian Bruckmayer
81ef4f0438 Merge pull request #1112 from Ana06/ability_test 
Creation of my_conference repeated in ability_spec
 2016-08-08 14:05:30 +02:00
Ana
7e5d20c89d style: if ! changed by unless 
- if ! changed by unless as it is more readable
- !object.blank? is equivalent to object.present?, also more readable
 2016-08-06 00:57:07 +02:00
Ana
71b39bb612 creation of my_conference repeated in ability_spec 
my_conference is created several times in ability_spec but it is not necessary.
 2016-07-29 19:58:11 +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
1559b29d2d Rubocop class length increased 
Rubocop class length increased in 5 lines as app/models/conference.rb had too many lines.
 2016-07-25 11:33:30 +02:00
Ana
bf7f5ce09f The schedule takes you to the current day and time 
The schedule takes you to the current day and time in case that the current date belongs to the conference schedule.

Closes https://github.com/openSUSE/osem/issues/1057
 2016-07-25 11:33:30 +02:00
Ana
39c4261859 All events takes you to the current day 2016-07-25 11:33:30 +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
6f20031bc1 _carousel hamlfy 
carousel changed to haml
 2016-07-25 11:33:29 +02:00
Ana
cd32ddd422 _schedule hamlfy 
_schedule changed to haml
 2016-07-25 11:33:29 +02:00
Ana
818c55df5a Tracks color in all events takes background into account. 
It uses https://github.com/openSUSE/osem/pull/1044 to select black or white color for the track text depending on what of them contrast more with the track background.
 2016-07-25 11:33:28 +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
14b0669f8b Merge pull request #1103 from Ana06/event-serializer-length 
Default value for length in as_json fixed
 2016-07-22 13:23:17 +03:00
Stella Rouzi
59eeb7edbd Enable blind voting 2016-07-22 12:21:54 +03:00
Ana
a0fc9dd950 Default value for length in as_json fixed 
The default value for length in as_json should be a multiple of EventType::LENGTH_STEP.
 2016-07-18 11:45:59 +02:00
Christian Bruckmayer
8388385b51 Merge pull request #1102 from Ana06/unused-css 
unused css removed
 2016-07-15 14:12:54 +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
7a95c43a57 Require less variables for heroku. 
Fixes #1095
 2016-07-12 16:28:50 +02:00
Christian Bruckmayer
69a5d41b79 Merge pull request #1080 from Ana06/text-color 
Text color of event types and difficulty levels
 2016-07-11 16:31:47 +02:00
Ana
feb002de1a Text color of event types and difficulty levels 
Changing the text color of event types and difficulty levels taking the background color into account. Similar to what it is done with tracks. See issue https://github.com/openSUSE/osem/issues/1033

Closes https://github.com/openSUSE/osem/issues/1078
 2016-07-11 15:32:02 +02:00
Christian Bruckmayer
28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color 
Different colors for new tracks, types and levels
 2016-07-11 15:10:26 +02:00
Ana
2e73c3f67b Rubocop class length increased 2016-07-11 13:46:02 +02:00
Ana
8d9bb56f06 Hexadecimal color changed to capital letters 
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
 2016-07-11 13:46:02 +02:00
Ana
0deaf1abc7 Different colors for new tracks, types and levels 
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.

Closes https://github.com/openSUSE/osem/issues/1077
 2016-07-11 13:46:01 +02:00
Stella Rouzi
eb312f139e Merge pull request #1084 from arun1595/define-singular-resource 
Modify conference registration to a singular resource
 2016-07-11 13:40:56 +03:00
Stella Rouzi
798998b73f Merge pull request #1085 from Ana06/validation 
Name validation repeated in Track
 2016-07-05 10:49:16 +02:00
Ana
9d4a82b062 Name validation repeated in Track 
The validation to check that the name is present in track.rb is twice.
 2016-07-05 10:13:41 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Henne Vogelsang
8b831b1977 Merge pull request #1070 from Ana06/style 
unnecessary %div deleted
 2016-07-01 14:52:36 +02:00
Henne Vogelsang
99d11bb3d0 Merge pull request #1073 from danimo/fix_osm_tiles_for_https 
Use protocol relative URL when loading OSM tiles
 2016-07-01 14:52:18 +02:00
Daniel Molkentin
2b43b348cd Use relative URL when loading OSM tiles 
This avoids mixed content warnings and gives us our
padlock back on Chromium and Firefox.

This also switches the domain for the tile servers from osm.org to
openstreetmap.org because the certificates do not mention osm.org
and hence using this domain the tiles fail to load.
 2016-07-01 14:27:32 +02:00
Ana
c1ce420c5d unnecessary %div deleted 
unnecessary %div deleted from haml files as div is the default
 2016-06-30 21:01:06 +02:00
Henne Vogelsang
8c27a3dbac Merge branch 'arun1595-venue-splash-page' 2016-06-30 17:31:46 +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
cdaefee323 Merge pull request #1065 from shyukri/scheduling_default_timezone 
Scheduling new conference: use default Time.zone.now instead of the 1…
 2016-06-30 12:43:47 +02:00