259 commits

Author	SHA1	Message	Date
Shriyansh	0ca19ea67a	added views for public view on splashpage,venue_edit,venue	2016-04-10 11:57:30 +05:30
Shriyansh	3bcdbe7469	defined ability for user with roles -organizer and cfp's, and some improvements in controller	2016-04-10 11:57:30 +05:30
Shriyansh	5cdedbf9a6	rubocop issues solved	2016-04-10 11:57:30 +05:30
Shriyansh	7bbb0da17a	done with creating relationship and generating view for venue_commercials	2016-04-10 11:57:30 +05:30
Shriyansh	dc0da8c500	defined ,tabular form ... defined ,tabular form	2016-04-10 11:57:30 +05:30
Shriyansh	6f667a865b	create_venue_commercial added	2016-04-10 11:57:30 +05:30
Nishanth Vijayan	11b96412a0	Remove unused call_for_paper model and controller files	2016-04-01 01:43:06 +05:30
Stella Rouzi	3f882957cf	rewrite comments form, use strong parameters with comments	2016-03-20 19:06:12 +02:00
Nishanth Vijayan	1c1e56ed46	Change update/save failures to use flash type :error instead of :alert	2016-03-16 11:20:56 +05:30
Nishanth Vijayan	19c54bd935	Change all redirect_to(path) to redirect path for uniformity	2016-03-16 09:17:41 +05:30
Nishanth Vijayan	434eb90b76	Add flash type error.Rewrite controllers to use common flash style with redirect_to	2016-03-16 09:17:41 +05:30
Stella Rouzi	782a1f071f	Merge pull request #801 from sonalkr132/targets_test ... Model and controller tests for Target	2016-03-09 12:13:53 +02:00
Aditya Prakash	c219ffc9a3	Tests for Admin::Targets controller ... Authorization in index action is not needed. Fix failed delete flash error message.	2016-03-06 10:46:04 +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
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
David Sedeño	00acf0c255	Fix room_params in scheduler update. fix #771	2016-02-08 22:52:58 +01:00
Henne Vogelsang	8e324ac1af	Fix showing a schedule without venue/rooms	2016-02-08 12:52:56 +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	444356fbc7	Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels	2016-02-06 17:42:51 +01:00
Christian Bruckmayer	28e55f3f50	Merge pull request #737 from ChrisBr/commercial_new ... Simplify adding commercials to conference and event	2016-01-21 20:29:03 +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	17a1c0e87c	fix hakiri issue	2016-01-21 20:19:37 +02:00
Stella Rouzi	355ecc0ac6	Introduce strong parameters	2015-12-23 11:36:50 +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	759aa54689	Syntax style + code groomming	2015-10-06 14:15:38 +03:00
raluka	f294316cba	added comments to explain comments_controller	2015-09-17 12:13:22 +02:00
raluka	a9a43d726f	WIP created tests for comments_controller.rb	2015-09-17 12:13:22 +02:00
raluka	21c10166ec	added test file for comments_controller WIP	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	800a41b3f9	added logic for available conferences based on roles in comments_controller.rb	2015-09-17 12:13:22 +02:00
raluka	52a503afd2	changed #signed_in_with_roles(user) in ability.rb model	2015-09-17 12:13:21 +02:00
raluka	35714f350e	Issue#15: Added Comment Notifications: notification_emails and comments view	2015-09-17 12:13:21 +02:00
raluka	3df77c84f6	Issue#690: fixed Attendance Button	2015-07-15 12:44:08 +02:00
Stella Rouzi	bc2b262510	add username and nickname in user#show and styling changes	2015-06-11 15:13:03 +03:00
Stella Rouzi	3b8b86eb85	show users per question	2015-04-22 18:55:51 +03:00
Stella Rouzi	6eef0c1ca7	Merge pull request #643 from differentreality/events_json ... fix scrolling of left column in schedule, show only @conference.events	2015-04-20 18:26:25 +03:00
Henne Vogelsang	b2c7d9be99	Merge pull request #617 from sonalkr132/hakiri_dos ... solves DOS on hakiri	2015-04-20 17:23:24 +02:00
Stella Rouzi	3b8c91bbd9	fix scrolling of left column in schedule, show only @conference.events	2015-04-20 13:17:47 +03:00
Henne Vogelsang	6a5cccbaad	Last stage of refactoring of the ability model and spec	2015-04-14 17:33:59 +02:00
Aditya Prakash	d11ebe96ff	solve dos on hakiri	2015-03-15 19:06:38 +05:30
Henne Vogelsang	0ce4aa0a49	Fix the ability spec ... * Get rid of the volunteer coordinator role, we don't use it currently * Test the ability with users that exclusively have a single role	2015-03-13 00:43:09 +01:00
Stella Rouzi	a845dd5d7d	add bootstrap-switch for is_highlight	2015-01-21 17:28:18 +02:00
Stella	11d0a71231	fix controller update	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
Stella	80fbc144ac	remove user deletion until further notice	2015-01-18 22:01:05 +02:00