gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1946 commits 2 branches 2 tags 50 MiB
Commit graph

1946 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ana
2d95cd05ff 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-02 00:44:04 +02:00
Ana
f65778b4fe 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: selected_schedule_room and selected_schedule_time
 2016-08-02 00:41:37 +02:00
Ana
47e316cddd 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-02 00:07:14 +02:00
Ana
af75334353 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-02 00:06:23 +02:00
Ana
cb9253ff07 SchedulesController introduced 
The actions #schedule and #events were moved from conference controller to the new controller
 2016-08-02 00:06:22 +02:00
Ana
c5e410843c Load and authorize schedule in ScheduleController 2016-08-02 00:06:20 +02:00
Ana
4abc60424d 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-02 00:04:30 +02:00
Ana
060d7e909c 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-01 22:37:20 +02:00
Ana
f8f1d9c61b Introduce an association for the selected_schedule 
Association in Program fot the selected_schedule
 2016-08-01 22:36:41 +02:00
Ana
17bfb02d27 javascript for the admin schedule moved to a .js 
Inline javascript for the admin schedule moved to a dedicated .js file.
 2016-08-01 22:36:08 +02:00
Ana
7ad7a6423d EventSchedule validations 
event, schedule, room and start_time are mandatory in EventSchedule.
 2016-08-01 22:36:08 +02:00
Ana
2aee0158f8 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-01 22:36:06 +02:00
Ana
8f3dcda2f7 Integrate the schedule in the admin interface 
Integrate the schedule in the admin interface while adapting it to the new associations and models.
 2016-07-29 22:14:20 +02:00
Ana
3bf42a3cc4 Tests for the new associations and models 
Tests for the schedule versioning new associations and models
 2016-07-27 22:23:29 +02:00
Ana
dea273d8bd 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-07-27 22:23:25 +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