331 commits

Author	SHA1	Message	Date
Henne Vogelsang	2e79f65989	Merge pull request #939 from Shriyanshagro/datepicker_constraints ... Defined DateTimepicker constraints	2016-04-20 16:19:41 +02:00
Shriyansh	bba9a552ec	attributes to send data to datepicker JS has been defined	2016-04-09 21:03:31 +05:30
Stella Rouzi	b9e10922ee	drop dietary choices, social events, and html_export_path	2016-04-09 16:29:20 +03:00
Christian Bruckmayer	86449eea67	Merge pull request #926 from sonalkr132/mailer-tests ... Mailer fixes and tests	2016-04-08 11:43:03 -06:00
Aditya Prakash	d9db395ec6	Use each to iterate over array in mailer and fix comment link ... *_url gives complete path with host	2016-03-31 22:59:12 +05:30
Justin Harrison	18b1ad2b70	More efficient listing of roles ... Reduces number of loops from 2 to 1.	2016-03-29 12:04:48 -04:00
Justin Harrison	7c38622e8f	Display roles in registration list	2016-03-26 13:25:54 -04:00
Henne Vogelsang	80a06b99b4	Merge pull request #894 from differentreality/comments ... rewrite comments form, use strong parameters with comments	2016-03-22 18:26:38 +01:00
Stella Rouzi	3f882957cf	rewrite comments form, use strong parameters with comments	2016-03-20 19:06:12 +02:00
Rishabh Saxena	99afc456cd	correcting ticket's details view and its related models.	2016-03-19 01:52:38 +05:30
Nishanth Vijayan	fd64db575b	Remove datatable functionality from Roles index table. ... The table in roles#index view has no need of datatable features as the number of roles is just 4.	2016-03-16 12:09:58 +05:30
Stella Rouzi	fb4e8958e0	Fix variable @program typo in programs#show	2016-03-09 20:11:59 +02:00
Rishabh Saxena	2c1db3bd2a	Making datatable responsive in admin's users view.	2016-03-07 15:15:29 +05:30
Stella Rouzi	18bb1bd237	Merge pull request #770 from hennevogel/feature_venue_show ... Beautify venue#show	2016-03-04 19:44:49 +02:00
Henne Vogelsang	33e1c6eae1	Beautify venues#show	2016-03-04 17:05:42 +01:00
Henne Vogelsang	f83e76102f	Make use of holder.js in venue#show	2016-03-04 15:59:17 +01:00
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
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
Stella Rouzi	a0d045e156	Remove attr_accessible from Program and Cfp, final fixes after introducing strong params	2016-02-06 17:43:51 +01:00
Stella Rouzi	f840f2b3f0	Rooms belong to venue	2016-02-06 17:43:51 +01:00
Stella Rouzi	feabbfbc99	rebase against email settings changes	2016-02-06 17:42: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
Christian Bruckmayer	57610eb39e	Merge pull request #716 from differentreality/abilities ... Abilities: Minor changes & grooming	2016-01-25 17:20:24 +01:00
chrisbr	23664119bd	Implement simplified commercials workflow ... It's now possible to simply enter the url of the third party provider to enter a commercial.	2016-01-21 19:41:12 +01:00
Stella Rouzi	8ffa8b1e86	Venue has show action, not index. Make the ability to schedule an Event more clear.	2016-01-13 13:16:15 +02:00
raluka	9eb47bd3f0	merged from upstream	2015-10-14 16:02:40 +02:00
raluka	3d57203727	added more consistency for email_settings	2015-10-14 15:34:23 +02:00
Stella Rouzi	2e692f7ea5	Merge pull request #705 from altsalt/master ... added Voted? column to admin/events view	2015-10-14 14:31:30 +03:00
Stella Rouzi	759aa54689	Syntax style + code groomming	2015-10-06 14:15:38 +03:00
raluka	0c4b0b4ac1	Refactored EmailSetting incosistency. Fixes #603	2015-10-06 11:32:40 +02:00
raluka	1cf877bf76	grooming style	2015-10-05 13:28:35 +02:00
raluka	f7c70ba55c	updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper	2015-09-21 15:56:57 +02:00
raluka	208478ff2d	added pretty view for comments	2015-09-17 12:13:22 +02:00
raluka	945bac1fe8	WIP modified CommentsController#index	2015-09-17 12:13:22 +02:00
raluka	bc67cac873	sorting comments after event title and created at in index	2015-09-17 12:13:22 +02:00
raluka	8dd0ac7c1d	rewrite CommentsController#index to have everything in one call	2015-09-17 12:13:22 +02:00
raluka	1addae9cd9	WIP changed CommentsController#index; temporary view for all_comments	2015-09-17 12:13:22 +02:00
raluka	7ba3cfd473	event title and conference title in 2 different lines now in view	2015-09-17 12:13:22 +02:00
raluka	800a41b3f9	added logic for available conferences based on roles in comments_controller.rb	2015-09-17 12:13:22 +02:00
raluka	35714f350e	Issue#15: Added Comment Notifications: notification_emails and comments view	2015-09-17 12:13:21 +02:00
Christian Bruckmayer	244ea9d34a	Merge pull request #708 from raluka/remaining_days ... Issue #649: Wrong days remaining label when submitting a new proposal	2015-08-28 13:27:42 +02:00
raluka	1de8f979cd	Issue #649: Wrong days remaining label when submitting a new proposal	2015-08-27 10:35:43 +02:00
William Hale	a0ffab098b	Wrapped voted? notification in label to promote visibility.	2015-08-11 06:23:41 -07:00
William Hale	4af7eef954	Removed Voted? column and added information to Rating column.	2015-08-11 05:57:08 -07:00
Stella Rouzi	49b38da188	Fix ordering for event.average_voting in events#index	2015-08-07 20:51:06 -07:00
William Hale	1a068d2d24	added Voted? column to admin/events view	2015-08-06 23:19:09 -07:00
Stella Rouzi	2a6ca7b0ff	Fix ordering for event.average_voting in events#index	2015-08-06 07:41:20 +03:00
raluka	3df77c84f6	Issue#690: fixed Attendance Button	2015-07-15 12:44:08 +02:00
Stella Rouzi	124d275a09	Merge pull request #671 from differentreality/registrations_xls ... Remove redundant code.	2015-07-02 21:27:15 +03:00
Stella Rouzi	8567a997cb	Merge pull request #679 from differentreality/switch ... Rework bootstrapSwitch	2015-07-02 13:08:16 +03:00