569 commits

Author	SHA1	Message	Date
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	f3996a9bff	added extra condition for view Create Conference link	2015-09-17 12:13:22 +02:00
raluka	37339dccc1	refactored comments_controller tests; fixed access to Administration link into user_menu view	2015-09-17 12:13:22 +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	0c39590f2e	fixed Administration link in user_menu dropdown	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	74dcd75a8c	created can_manage_comments helper for rendering button	2015-09-17 12:13:21 +02:00
raluka	e10a2491d3	created tests for user ability	2015-09-17 12:13:21 +02:00
raluka	b780996128	created comments with FactoryGirl	2015-09-17 12:13:21 +02:00
raluka	aa1ff51b58	small changes	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
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
Stella Rouzi	ebadb84f2f	Fix longitude latitude order	2015-06-17 22:08:18 +03:00
Christian Bruckmayer	491df2c5c6	Merge pull request #687 from meonkeys/fix-start-date-typo ... fix "End Date" typo on Call for Papers show	2015-06-17 12:08:54 +02:00
Adam Monsen	279817d57d	fix "End Date" typo on Call for Papers show	2015-06-16 21:26:15 -07:00
Christian Bruckmayer	a80e3d814e	Merge pull request #656 from bgeuken/make_schedules_links ... Make talks on schedules table real links	2015-06-15 22:06:33 +02:00
Stella Rouzi	53f0606ac1	Rework bootstrapSwitch	2015-06-14 22:28:33 +03:00
Stella Rouzi	a9f806ca39	Merge pull request #674 from differentreality/dasboard_todo_venu_link ... Edit link for venue in dashboard TODO list	2015-06-12 12:36:16 +03:00
Stella Rouzi	0013a3a814	Merge pull request #639 from differentreality/devise_partials ... Move common views to partial	2015-06-12 12:30:51 +03:00
Stella Rouzi	529a75eee6	Edit link for venue in dashboard TODO list	2015-06-12 10:34:31 +03:00
Stella Rouzi	04e9f77138	Remove redundant code.	2015-06-11 15:37:00 +03:00
Stella Rouzi	30831ce718	Add styling to passwords and confirmations	2015-06-11 15:20:48 +03:00
Stella Rouzi	28143a8cce	keep fields reference in devise new registration	2015-06-11 15:20:48 +03:00
Stella Rouzi	969c24c091	Move common views to partial	2015-06-11 15:20:48 +03:00
Stella Rouzi	393f26c679	De-activate buttons in registrations#show when conference has ended, so that user cannot edit registration details after the conference is over.	2015-06-11 15:15:02 +03:00
Stella Rouzi	fcca0e71d2	show label of confirmed or unconfirmed in users#show	2015-06-11 15:13:18 +03:00
Stella Rouzi	bc2b262510	add username and nickname in user#show and styling changes	2015-06-11 15:13:03 +03:00
Stella Rouzi	93bbd0ea0d	td width with col-md	2015-06-11 13:31:03 +03:00
Stella Rouzi	1890aece1d	remove datatable error in admin/users#index due to submissions table	2015-06-11 13:30:08 +03:00