Commit graph

81 commits

Author SHA1 Message Date
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
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
Chrisbr
5f8a8ac6d9 Refactoring Tickets
- Tickets now independent from registration
- Implemented money gem
#419
2014-08-28 15:21:05 +02:00
Stella Rouzi
b5b85ede71 delete events without submitter 2014-08-15 20:45:28 +03:00
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object
close #420
2014-08-06 14:30:50 +02:00
Artem Chernikov
f8784fdcd8 rubocop style fix Style/AlignParameters 2014-07-30 23:32:29 +02:00
Gopesh Tulsyan
8678b90129 Fixing emails to send them with delayed jobs 2014-07-29 00:50:39 +05:30
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Chrisbr
6f3426b6a2 Implements "Add template" button for email settings
close #16
Subjects now mandatory if send mail enabled
2014-07-23 13:42:18 +02:00
Chrisbr
a88f7c168f [Bugfix] Implements check if mail templates not nil
fix #286
2014-07-23 13:42:18 +02:00
Artem Chernikov
763f864dc9 Fix basic style issues with rubocop 2014-07-21 15:05:58 +02:00
Chrisbr
d1b038c5a7 [Bugfix] Confirmed / Unconfirmed events over time for conference dashboard 2014-07-18 15:22:15 +02:00
Henne Vogelsang
064e0a3fd7 Create default event_types. More event validations. Fixes #319 2014-07-16 14:23:16 +02:00
Stella Rouzi
fc753282d3 hound fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
9292b79c78 houndci fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Chrisbr
596027e49b [Bugfix] Conference methods related to weeks now database independent 2014-06-26 13:28:48 +02:00
Chrisbr
b25ae50908 Implements user and event state distribution 2014-06-11 09:31:13 +02:00