546 commits

Author	SHA1	Message	Date
nilsding	f7cb3478be	:medium everywhere	2014-12-29 14:57:16 +01:00
nilsding	e7a0d77fd4	changed flash thing	2014-12-29 14:54:32 +01:00
nilsding	3e033cc102	permit more params!	2014-12-29 14:52:06 +01:00
nilsding	7aa954e212	added cropper processor	2014-12-29 14:51:52 +01:00
nilsding	b61a631f15	added hidden fields	2014-12-29 14:50:25 +01:00
nilsding	4adc6eec09	ugh	2014-12-29 14:49:57 +01:00
nilsding	bba9fb8354	removed gravatar warning	2014-12-29 13:56:23 +01:00
nilsding	5071e3ffe8	added JCrop to view	2014-12-29 13:52:19 +01:00
nilsding	7074a1edf7	mark gravatar-url as deprecated	2014-12-29 12:56:41 +01:00
nilsding	b378a03afa	added delayed_paperclip	2014-12-29 11:58:01 +01:00
nilsding	678e03deed	uploading profile pictures works now	2014-12-29 11:21:43 +01:00
nilsding	501f039e7f	gravatar_url returns the users' profile_picture	2014-12-29 10:18:38 +01:00
nilsding	cf3933271a	added profile_picture to users	2014-12-29 10:18:12 +01:00
nilsding	f6ceafb710	added jquery.Jcrop	2014-12-29 09:39:47 +01:00
Andreas N	70ac565e6b	added following information thingy	2014-12-29 02:32:44 +01:00
nilsding	65e90e1c64	reporting users works as well.	2014-12-29 01:47:04 +01:00
nilsding	27558f83c4	made tabs work	2014-12-29 01:25:48 +01:00
nilsding	34a2f3cd6b	deleting comments works now	2014-12-29 01:05:30 +01:00
nilsding	a0c0d68e43	posting moderation comments works now	2014-12-29 00:50:14 +01:00
nilsding	b7b5ee960e	deleting reports works now	2014-12-29 00:21:06 +01:00
nilsding	486d5d18f2	this fucker finally works how I want it to	2014-12-28 23:57:07 +01:00
nilsding	7a0b3f4af7	added votes for reports	2014-12-28 23:26:16 +01:00
nilsding	3f3591c6e7	removed hardcoded occurrences of "justask"	2014-12-28 22:39:10 +01:00
nilsding	49c371302c	unique smiles only!	2014-12-28 22:15:25 +01:00
nilsding	40f54fd19a	more before_destroy and after_create	2014-12-28 21:58:35 +01:00
nilsding	bb3e431393	added associations for this	2014-12-28 21:47:51 +01:00
nilsding	2c29dd9a18	even more after_create and before_destroy	2014-12-28 21:46:57 +01:00
nilsding	7d157cde8f	dependent: :destroy	2014-12-28 21:42:21 +01:00
nilsding	9c9c4fdc5d	after_create and before_destroy	2014-12-28 21:40:33 +01:00
nilsding	fec91eeb5b	before_destroy	2014-12-28 21:34:42 +01:00
nilsding	7d55141a1a	added deleted column to reports	2014-12-28 21:34:36 +01:00
nilsding	b6c0b1864a	moved some code	2014-12-28 21:20:07 +01:00
nilsding	6d81b4a24b	FUCK this!!!!!	2014-12-28 21:14:10 +01:00
nilsding	b3f165b12b	reporting and deleting comments works now	2014-12-28 21:14:01 +01:00
nilsding	27afd18d25	fixed follow button	2014-12-28 20:22:37 +01:00
Andreas N	f158acff3f	added delete button to moderationbox	2014-12-28 20:13:45 +01:00
nilsding	7bfa5132dd	added link to the reported object	2014-12-28 20:05:30 +01:00
nilsding	6864faee03	reporting answers works now	2014-12-28 19:56:37 +01:00
nilsding	9fe827b537	removed .button calls for destroy	2014-12-28 19:56:13 +01:00
nilsding	ce280fffa1	reporting things via ajax works now	2014-12-28 19:55:50 +01:00
nilsding	3f24542410	added git info for development rails env	2014-12-28 19:45:49 +01:00
nilsding	774cf8df99	h	2014-12-28 19:32:08 +01:00
nilsding	90fe42e643	Merge remote-tracking branch 'origin/master' into moderation ... Conflicts: app/models/user.rb	2014-12-28 19:29:01 +01:00
nilsding	5829d4f1ef	removed unnecessary p tag	2014-12-28 19:11:36 +01:00
nilsding	0e4d744478	added Markdown to answers	2014-12-28 19:06:49 +01:00
nilsding	d79394640e	fixed GitHub issue #25	2014-12-28 00:34:56 +01:00
nilsding	3046a5e4b3	fixed tweet not tweeting	2014-12-27 21:03:18 +01:00
Andreas N	4bb65be9e5	css changes	2014-12-27 19:26:35 +01:00
Andreas N	6b3552526c	css changes	2014-12-27 19:24:46 +01:00
Andreas N	f236e7b709	css changes	2014-12-27 19:22:27 +01:00
Andreas N	05002b8d10	added floating ask your followers button	2014-12-27 19:18:55 +01:00
nilsding	35e956e692	dropdown is now left	2014-12-27 18:14:31 +01:00
Andreas N	33694d3820	hiding block-button for now	2014-12-27 18:12:50 +01:00
Andreas N	d0000f0754	block-sized action button	2014-12-27 18:10:04 +01:00
Andreas N	8a6d661216	added actions for user profile	2014-12-27 18:07:25 +01:00
nilsding	a487ed7f69	update! raises an exception while update does not.	2014-12-27 17:37:54 +01:00
nilsding	e789fb7e68	finally made that worker work.	2014-12-27 17:33:49 +01:00
Andreas N	2e048d9472	add text for no comments	2014-12-27 16:38:07 +01:00
nilsding	cd289a32c4	removed report comment thing	2014-12-27 16:18:02 +01:00
nilsding	e75284dba0	added some view logic	2014-12-27 16:14:57 +01:00
Andreas N	84806a8001	copy-pasted comment section for moderation	2014-12-27 16:09:04 +01:00
Andreas N	56441a4967	more fix.	2014-12-27 16:03:09 +01:00
Andreas N	70f629582e	Merge remote-tracking branch 'origin/moderation' into moderation	2014-12-27 15:59:30 +01:00
Andreas N	3c2467092b	fixing other stuff I broke with this fix.	2014-12-27 15:59:09 +01:00
nilsding	642d88da07	,	2014-12-27 15:56:34 +01:00
nilsding	2df18c6dd7	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:56:12 +01:00
Andreas N	be30f9c7e5	PLEASE WORK	2014-12-27 15:56:01 +01:00
nilsding	6a1bc6e867	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:54:36 +01:00
Andreas N	7a9949c85c	PLEASE	2014-12-27 15:54:26 +01:00
nilsding	1a131d8c47	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:50:59 +01:00
Andreas N	edeff57293	Fixxed!	2014-12-27 15:50:36 +01:00
nilsding	5c5edbab13	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:40:07 +01:00
Andreas N	be44301874	I hope this finally fixes it ;_;	2014-12-27 15:39:45 +01:00
nilsding	27aa704511	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:38:16 +01:00
Andreas N	018a377c24	finally	2014-12-27 15:38:06 +01:00
nilsding	f1298a416f	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:31:44 +01:00
Andreas N	9522bfa8f0	I should probably put that in the right file	2014-12-27 15:31:34 +01:00
nilsding	8a23ce0cf3	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:28:10 +01:00
nilsding	4e81467163	hhhh	2014-12-27 15:28:01 +01:00
Andreas N	2e2c2dac58	trying to fix dropdowns	2014-12-27 15:27:39 +01:00
Andreas N	1700bfb0f5	update comment design again	2014-12-27 15:22:30 +01:00
Andreas N	f8d8c13fb9	update comment design	2014-12-27 15:15:35 +01:00
Andreas N	c7c10b43b9	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:13:05 +01:00
Andreas N	395d1691f8	update comment design	2014-12-27 15:12:57 +01:00
nilsding	260d5cddd7	updated delete button	2014-12-27 14:59:48 +01:00
nilsding	b625144993	added moderation models	2014-12-27 14:35:09 +01:00
Andreas N	a5c8405b9a	attempt to fix this shit	2014-12-27 03:01:52 +01:00
nilsding	1a43ae0054	UND NACH RECHTS, RECHTS, RECHTS, IMMER NACH RRRECHTS	2014-12-27 02:34:01 +01:00
Andreas N	2c8cd5bc3e	fix broken dropdown	2014-12-27 02:29:57 +01:00
Andreas N	bdd3cd5afc	Added button for report/delete actions	2014-12-27 02:26:51 +01:00
Andreas N	92af469aa4	Merge branch 'master' into moderation	2014-12-27 02:12:32 +01:00
nilsding	64d50ad9b4	fox'd	2014-12-27 01:55:09 +01:00
nilsding	a37cd95f46	Merge branch 'master' into notifications-tooltips	2014-12-27 01:46:34 +01:00
nilsding	e570f40a36	WRYYYYYYYYYYYYYYYYYY	2014-12-27 01:45:24 +01:00
nilsding	88e9d7599d	dragons	2014-12-27 01:22:13 +01:00
nilsding	9fe8be1db8	Merge branch 'master' of git.rrerr.net:justask/justask ... Conflicts: app/views/shared/_answerbox.html.haml	2014-12-27 00:40:02 +01:00
nilsding	c817f32b18	j	2014-12-27 00:39:03 +01:00
Andreas N	20c173442d	remove that button	2014-12-27 00:37:42 +01:00
Andreas N	4961a44d59	add collapsed view for single answerbox	2014-12-27 00:33:45 +01:00
nilsding	d31bfa6d8b	added a few placeholders	2014-12-27 00:19:55 +01:00