Commit graph

97 commits

Author SHA1 Message Date
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
Sunny
03fa299058 enable style/dotposition rubocop cop 2017-04-06 23:19:58 -04:00
Chaitanya
4427f43bdf Enable Style/RedundantSelf Rubocop cop
This cop checks for redundant uses of self. It supports autocorrection, so all the offenses where automatically solved.

Closes #1373
2017-03-28 13:27:52 +05:30
gotens1211
4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop
Cleared all the offenses for Style/SpaceAroundOperators

Added a description for the Style/SpaceAroundOperators Rubocop.
2017-02-05 19:43:00 +05:30
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
Ana
a578167cf5 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.
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
beb17165a2 Introduce an association for the selected_schedule
Association in Program fot the selected_schedule
2016-08-11 15:11:27 +02:00
Ana
0b26ed5c35 EventSchedule validations
event, schedule, room and start_time are mandatory in EventSchedule.
2016-08-11 15:11:27 +02:00
Ana
354e15a76d 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-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
c047ffd699 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-08-11 15:06:52 +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
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
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
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
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
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
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +03:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Henne Vogelsang
21280cd9d8 Switch mail sending to active_job
Before we were using the delayed_job method of delaying
mail sending which isn't working anymore on rails 4.
2016-04-20 18:59:24 +02:00
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +02:00
Nishanth Vijayan
246bf605ea Proposal submitter should be asked to add track only if conf has track 2016-03-23 23:31:00 +05:30
Christian Bruckmayer
9fbd2e9618 Merge pull request #827 from hennevogel/feature-proposal_for_track
Feature: Add/change Track for Event
2016-03-07 17:12:33 +01:00
Henne Vogelsang
feaf9d8078 Feature: Add/change Track for Event 2016-03-05 02:54:09 +01:00
Stella Rouzi
81c82466f8 Add tests for Event. Remove redundant function 'def week' from Event. 2016-03-04 19:46:25 +02:00
David Sedeño
4783bc99b5 Fix error 500 in user proposal confirmation. fix #782 2016-02-17 18:19:32 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 2015-10-06 11:32:40 +02:00
Stella Rouzi
2a6ca7b0ff Fix ordering for event.average_voting in events#index 2015-08-06 07:41:20 +03:00
Björn Geuken
ca7f1a3b25 Simplify progress calculation 2015-05-16 15:27:42 +02:00
Björn Geuken
1862534b2c Avoid float conversion when calculating progress 2015-05-16 15:27:34 +02:00
Björn Geuken
5043d26cc5 Update comment of calculate_progress method 2015-05-16 15:17:20 +02:00
Björn Geuken
8250e1305e event: refactor get_state_color method 2015-04-17 16:38:03 +02:00
Björn Geuken
82edf7870a event: refactor as_json method and add a test 2015-04-17 16:38:01 +02:00
Björn Geuken
80f8bba951 Refactor abstract_word_count method 2015-04-17 16:27:47 +02:00
Björn Geuken
9f3da955f0 Move default value into else branch and remove superfluous variable 2015-04-17 16:27:44 +02:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
chrisbr
232cc249d4 Implements program section for unscheduled events
close #610
2015-03-09 15:31:06 +01:00
Stella
11d0a71231 fix controller update 2015-01-21 17:28:18 +02:00
chrisbr
799fd0c3a4 Adds dependent restricted association to some models
fix #348
2014-12-18 13:38:40 +01:00
Stella Rouzi
343694d076 Merge pull request #524 from differentreality/remove_attachment
remove leftovers from event attachment removal
2014-11-12 13:45:51 +02:00
Stella
a2c9e15236 remove leftovers from event attachment removal 2014-11-09 20:47:34 +02:00
Stella
2f080fb458 Fix proposal error message. Username -> name. 2014-11-09 15:58:44 +02:00