1587 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
raluka	fd709ed4c0	Issue #686: Postalcode requires number	2015-10-05 13:08:02 +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	5790d99fac	Merge branch 'view_comment_notification' of https://github.com/raluka/osem into view_comment_notification	2015-09-17 12:26:19 +02:00
raluka	1b63728440	Grooming conference.rb to fix rubocop offenses	2015-09-17 12:23:01 +02:00
raluka	f294316cba	added comments to explain comments_controller	2015-09-17 12:13:22 +02:00
raluka	1fb1071feb	moved comment instance into before block	2015-09-17 12:13:22 +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	a9a43d726f	WIP created tests for comments_controller.rb	2015-09-17 12:13:22 +02:00
raluka	208478ff2d	added pretty view for comments	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	7ba3cfd473	event title and conference title in 2 different lines now in view	2015-09-17 12:13:22 +02:00
raluka	cd2a52023b	changed comments helper to proper return unread comments available for current_user	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	df29484317	changed wrong test for ability	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	6985493e5c	unread_notifications has no longer assigned instance variable	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
raluka	11bf53442c	Grooming code to fix rubocop offenses	2015-09-17 12:12:51 +02:00
raluka	96e6adc71c	added comments to explain comments_controller	2015-09-16 14:00:00 +02:00
raluka	4d745fb6e3	moved comment instance into before block	2015-09-16 13:29:52 +02:00
raluka	e6480d2676	added extra condition for view Create Conference link	2015-09-16 12:23:45 +02:00
Stella Rouzi	37697517df	Merge pull request #710 from differentreality/fix_api ... undo deletion of function, so that api works (/api/v1/conferences/)	2015-09-16 10:45:09 +03:00
Stella Rouzi	fb607050fe	undo deletion of function, so that api works (/api/v1/conferences/)	2015-09-16 10:25:52 +03:00
raluka	850782abee	refactored comments_controller tests; fixed access to Administration link into user_menu view	2015-09-15 12:39:36 +02:00
raluka	a8815aff5e	WIP created tests for comments_controller.rb	2015-09-14 18:50:21 +02:00
raluka	81c4d1381c	added pretty view for comments	2015-09-10 11:46:49 +02:00
raluka	d365d5efa1	added test file for comments_controller WIP	2015-09-09 16:50:07 +02:00
raluka	e5c235ac32	WIP modified CommentsController#index	2015-09-09 12:15:59 +02:00
raluka	932cb9984f	sorting comments after event title and created at in index	2015-09-08 14:27:14 +02:00
raluka	b762b82e74	rewrite CommentsController#index to have everything in one call	2015-09-08 12:15:22 +02:00
raluka	449d466f7d	WIP changed CommentsController#index; temporary view for all_comments	2015-09-07 18:56:26 +02:00
raluka	be55456c78	event title and conference title in 2 different lines now in view	2015-09-03 17:03:05 +02:00
raluka	55eddbfde7	changed comments helper to proper return unread comments available for current_user	2015-09-03 14:20:11 +02:00
raluka	f3fa68e371	fixed Administration link in user_menu dropdown	2015-09-03 14:04:16 +02:00
raluka	bcd8e41670	added logic for available conferences based on roles in comments_controller.rb	2015-09-03 12:17:42 +02:00
raluka	5664b99dc4	changed #signed_in_with_roles(user) in ability.rb model	2015-09-01 13:01:57 +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	062762089b	changed wrong test for ability	2015-08-27 12:36:35 +02:00
raluka	1de8f979cd	Issue #649: Wrong days remaining label when submitting a new proposal	2015-08-27 10:35:43 +02:00
raluka	a3b6f204cb	created can_manage_comments helper for rendering button	2015-08-26 22:09:36 +02:00