Commit graph

137 commits

Author SHA1 Message Date
Ana
460d117d7a making next_color function more readable 2016-06-25 15:36:43 +02:00
Ana
62c3ee1631 Statistics on top of Registrations#index 2016-06-25 14:39:45 +02:00
Ana
f5701f2e77 Statistics on top of Events#index 2016-06-25 14:39:45 +02:00
Henne Vogelsang
40023044af Use PictureUploader on Conference 2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f Remove danging :photos table and other photo cruft 2016-04-27 17:40:18 +02:00
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +02:00
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Nishanth Vijayan
48b48e88ac Add before_destroy :cancel to precent role destroy.Change Conference-Role association to have dependent: :destroy_all 2016-03-28 19:49:59 +05:30
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Henne Vogelsang
e2fb83146a Merge pull request #768 from hennevogel/rubocop
Update rubocop todo file
2016-02-18 14:08:04 +01:00
David Sedeño
28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 2016-02-10 15:59:39 +01:00
Henne Vogelsang
046f726414 rubocop: Update todo file, enable rails cops 2016-02-08 14:57:23 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +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
152b59aade Fix failed tests of #756 2016-01-21 13:05:27 +02:00
chinmaydd
4eafa43f7e Fixes Start date being greater than End date 2016-01-21 00:26:37 +05:30
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00
raluka
0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 2015-10-06 11:32:40 +02:00
raluka
11bf53442c Grooming code to fix rubocop offenses 2015-09-17 12:12:51 +02:00
Stella Rouzi
fb607050fe undo deletion of function, so that api works (/api/v1/conferences/) 2015-09-16 10:25:52 +03:00
Henne Vogelsang
68efa06696 Merge pull request #660 from bgeuken/conference_model
Conference model
2015-07-02 16:28:06 +02:00
milovanderlinden
5683974151 Fix for #684 2015-06-16 23:09:47 +02:00
Björn Geuken
c972731e20 Small refactoring of get_status & self.get_event_state_line_colors 2015-05-28 10:38:38 +02:00
Björn Geuken
12fa985fff conference: refactor some conditions 2015-05-27 16:06:17 +02:00
Björn Geuken
5a5745947d Simplify cfp_open? method 2015-05-27 16:06:17 +02:00
Björn Geuken
c58585d445 cleanup: if !object.nil? -> if object 2015-05-27 16:06:17 +02:00
Björn Geuken
a1d022d0be Refactor user_registered? method 2015-05-27 16:06:14 +02:00
Björn Geuken
3e77241f8a user_registered: Return false if user is nil
The return value of user_registered? is only used as boolean. So we can
don't need to hande non existent users separately.
2015-05-27 16:02:01 +02:00
Björn Geuken
f180ce0d27 Refactor registration_open? method, part II 2015-05-21 19:16:02 +02:00
Björn Geuken
0d8a77c9ef Refactor registration_open? method
The registration_period is already checked in registration_dates_given?
method. No need to check it twice
2015-05-21 19:16:02 +02:00
Björn Geuken
bc966259fb Refactor registration_dates_given? 2015-05-21 19:16:01 +02:00
Björn Geuken
7638b33926 Fix registration_dates_given?
When the registration period is nil registration_dates_given? should return
false.
2015-05-21 19:16:01 +02:00
Henne Vogelsang
6cc8c1e5c2 Merge pull request #635 from bgeuken/refactor_calculate_progress
Refactor calculate progress
2015-04-20 17:21:15 +02:00
Björn Geuken
650a49d87b Update method documentation (returns a string not an fixnum) 2015-04-17 14:46:25 +02:00
Björn Geuken
ac0abce6e1 Small refactoring of calculate_setup_progress, part II 2015-04-17 14:46:21 +02:00
Björn Geuken
d910a0f532 Small refactoring of calculate_setup_progress 2015-04-17 12:21:52 +02:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
Christian Bruckmayer
ff124632ef Merge pull request #611 from shayonj/dashboard-status-minutes-fix
Fixing functions for minutes to hours conversion for dashboard
2015-03-16 12:20:51 +01:00
chrisbr
232cc249d4 Implements program section for unscheduled events
close #610
2015-03-09 15:31:06 +01:00
Shayon Mukherjee
37164e3694 Fixing functions for minutes to hours conversion for dashboard 2015-03-02 11:36:42 -06:00
Stella Rouzi
2dd326c8b9 show only confirmed events as highlights 2015-01-21 17:28:18 +02:00
Stella Rouzi
ecfc348ea8 add highlights and fix cfp in splashpage 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
Henne Vogelsang
9c968ad3e2 Create some DifficultyLevels by default 2014-11-27 15:05:44 +01:00
Henne Vogelsang
28063129c7 Implement consistent admin interface
* Consistent route/model/controller/view layout
* Get rid of unused photos, speakers, dietchoices, social_events controllers
* Drop unused :public from Rooms and :description from CallForPapers
2014-11-25 10:47:18 +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
e65ca7fb58 Get rid of the home controller 2014-11-14 17:24:24 +01:00