557 commits

Author	SHA1	Message	Date
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
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
Björn Geuken	b685628208	Remove superflous condition ... We ensured that the event has a track in the condition 3 lines above. Thus we can remove this one.	2015-05-16 15:00:21 +02:00
Björn Geuken	94bb76f5ec	Haml'fy schedule_item partial	2015-05-16 15:00:17 +02:00
Björn Geuken	7309782b05	TypoFix: <span> -> </span>	2015-05-16 14:50:12 +02:00
Björn Geuken	02e6f78153	Handle talks on the scheduler table as links ... Previously the link functionality (open in window or tab) of those talks was done via javascript. Because of that they couldn't be selected via right click to be opened in a tab, copied or bookmarked. By embedding the talk items into a link element and adding some css to hide the link effects, like hover and underline, we get the desired behaviour without changing it's appearance.	2015-05-15 17:52:51 +02:00
Björn Geuken	93135a6085	Move view for proposals on schedule board into a partial	2015-05-15 17:27:22 +02:00
Björn Geuken	1731625153	Remove superflous span element ... At least firefox and chrome doesn't even render it	2015-05-15 17:22:46 +02:00
Björn Geuken	54f86a3212	Replace tabs by whitespaces and fix indentation	2015-05-15 17:20:38 +02:00
Tommy Jans	1cbda33564	osc15 ruby workshop fixing issue #650	2015-05-07 11:35:26 +02:00
Henne Vogelsang	40e08b5624	Update edit.html.haml	2015-05-02 15:07:31 +02:00
Henne Vogelsang	4ed8a72967	Widen the sign-in menu a bit	2015-04-23 11:23:20 +02:00
Henne Vogelsang	c3330a846f	Always show the Update button for registrations	2015-04-23 11:23:20 +02:00
Stella Rouzi	ef96da7144	include questions in registrations pdf and xls	2015-04-23 12:07:11 +03:00