242 commits

Author	SHA1	Message	Date
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	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
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	b927b3bc87	orrrr	2014-12-25 15:16:57 +01:00
nilsding	4e2cfd5188	???	2014-12-25 15:16:10 +01:00
nilsding	de1ef57a8a	dose that work	2014-12-25 15:13:52 +01:00
Andreas N	4f777968e5	readded links to questions on user profile	2014-12-25 14:26:35 +01:00
Andreas N	a09c01cc44	fixed text display for anon questionbox	2014-12-25 14:22:49 +01:00
Andreas N	ba9b6d1e12	add link to question/answer in question display	2014-12-20 02:14:27 +01:00
Andreas N	a764632538	more fixes and updates	2014-12-19 23:03:03 +01:00
Andreas N	c1f0388da4	I reached the end of the file, fixing this I finally did it	2014-12-19 22:58:06 +01:00
Andreas N	f7e35a3977	fix stuff	2014-12-19 22:56:16 +01:00
Andreas N	e9985ed0aa	how about new template	2014-12-19 22:52:12 +01:00
pixeldesu	c3905791b6	move answer link to 'answered by username' section	2014-12-16 16:14:42 +01:00
nilsding	a30e6509b5	fixed things	2014-12-15 07:47:56 +01:00
nilsding	5da0778131	fixed link	2014-12-14 15:58:39 +01:00
pixeldesu	3bcd67d1a4	rounded image was missing	2014-12-14 15:42:54 +01:00
pixeldesu	91711b24fe	add a bit of margin to smiles section	2014-12-14 15:41:08 +01:00
pixeldesu	d963191bd0	added smile display to answerbox	2014-12-14 15:22:37 +01:00
pixeldesu	c4bdc8fd3e	design updates	2014-12-12 19:01:34 +01:00
nilsding	54ec828e5b	display_all	2014-12-12 18:54:17 +01:00
nilsding	4d944e1684	Karim abused this too much	2014-12-12 18:49:34 +01:00
pixeldesu	0e52a9aef8	attempt to fix overlapping comment count	2014-12-10 21:16:18 +01:00
pixeldesu	98b63b45c6	splitting scss, pluralizing entries, etc	2014-12-09 15:32:29 +01:00
nilsding	e63e52f585	the count is now incremented/decremented correctly on the view followers/friends pages	2014-12-08 19:48:12 +01:00
nilsding	742bba0b12	?	2014-12-08 17:10:09 +01:00
nilsding	30c8654a27	added follower/following pages	2014-12-08 17:03:06 +01:00
nilsding	2caf81d08e	ayyyy vodka	2014-12-08 16:01:27 +01:00
nilsding	7de522a82f	added question#show thing and more...	2014-12-07 20:51:44 +01:00
nilsding	a9f5ddab65	added thing	2014-12-07 20:18:53 +01:00
pixeldesu	01c5577cdd	changed display for comments	2014-12-07 15:36:08 +01:00
nilsding	8ab5458b1b	posting comments is now possible.	2014-12-07 15:05:44 +01:00
nilsding	a34972379f	unregistered users will see the smile_count if at least someone smiled the answer	2014-12-07 12:46:25 +01:00
nilsding	a2e1e2557b	smile count is now in the button itself if the user is signed in	2014-12-05 20:21:15 +01:00
nilsding	c276b6aacf	added comment text input box thing	2014-12-05 20:17:44 +01:00
nilsding	668b032a25	the comment button now actually does something!	2014-12-05 19:50:21 +01:00
nilsding	641fa1ddc3	added show answer thing	2014-12-05 07:02:23 +01:00
nilsding	c159e3b5bc	INDENTATIONS	2014-11-30 21:15:51 +01:00
nilsding	631aed196b	new partial...	2014-11-30 21:14:55 +01:00
nilsding	bc77ad0032	Gebrechungsschaden	2014-11-30 21:12:17 +01:00
pixeldesu	484c8d9b65	alternate display	2014-11-30 21:02:17 +01:00
pixeldesu	ba625247ae	remove timestamp from question asked	2014-11-30 20:59:21 +01:00
pixeldesu	433b0cc3a0	more fixes about fixes	2014-11-30 20:51:44 +01:00
pixeldesu	5687feeb0a	more fixes	2014-11-30 20:47:28 +01:00
pixeldesu	e20037a89a	timestamp	2014-11-30 20:45:21 +01:00
nilsding	f1d93646a2	better check 'em thrice	2014-11-30 20:37:52 +01:00
nilsding	dccb7f9116	better check 'em twice	2014-11-30 20:37:10 +01:00
nilsding	f6906d0dde	check your timestamp privileges	2014-11-30 20:36:26 +01:00
nilsding	97c197f112	smiles!!!	2014-11-30 20:31:22 +01:00
pixeldesu	7364de190f	more fixes	2014-11-30 17:40:31 +01:00
pixeldesu	63276a57ef	fixes	2014-11-30 17:36:26 +01:00
pixeldesu	f5231ec304	hiding smiled-text on mobile devices	2014-11-30 17:35:03 +01:00
pixeldesu	5829046402	added smile to timeline page	2014-11-30 17:31:42 +01:00
pixeldesu	a6af5e7609	added spans	2014-11-30 17:28:28 +01:00
pixeldesu	33d42b6a76	dash o	2014-11-30 17:24:24 +01:00
pixeldesu	ecdaf7d45f	added buttons that don't do a thing yet	2014-11-30 17:22:34 +01:00
nilsding	155b60f8b2	"answered by xyz" should not be shown on the user page	2014-11-30 16:09:39 +01:00
pixeldesu	dbdb3c81ab	removed newline	2014-11-30 16:07:56 +01:00
nilsding	03bce30714	fixed indentation	2014-11-30 16:06:42 +01:00
pixeldesu	c0c6ac182b	added username of user who answered the question	2014-11-30 16:04:37 +01:00
pixeldesu	3496cd7f0a	hide images if anonymous and links to profiles	2014-11-30 14:43:27 +01:00
pixeldesu	2b81ad86db	added gravatar support	2014-11-30 14:31:38 +01:00
pixeldesu	bf4a90b8b5	pull?	2014-11-30 14:01:36 +01:00
pixeldesu	e8d7874bef	lets try to fix this stuff here	2014-11-30 13:52:44 +01:00
pixeldesu	6a722af2f7	more changes to answerbox	2014-11-30 00:23:11 +01:00
pixeldesu	057ebe08af	more changes to answerbox	2014-11-29 23:29:34 +01:00
pixeldesu	fa313dc2c1	equals	2014-11-29 23:21:31 +01:00
pixeldesu	6c04d1d24d	answerbox update things	2014-11-29 23:18:52 +01:00
nilsding	685b0efe83	added motivation header	2014-11-29 22:34:11 +01:00
nilsding	dc83151e65	fixed delete button not showing up	2014-11-28 19:23:54 +01:00
nilsding	4476e54ca5	added answerbox	2014-11-27 11:50:29 +01:00
nilsding	493bfe881c	added links to the bottom of some pages	2014-11-17 13:19:08 +01:00
pixeldesu	6cb23c818e	ROW ROW FIGHT THE POWER	2014-11-13 20:02:41 +01:00
nilsding	c19f44f527	added site_name to the promotion box, removed "Front" navbar entry for non-registered users	2014-11-11 06:41:04 +01:00
nilsding	2cc1062af7	allahu snackbar	2014-11-08 20:41:08 +01:00
nilsding	cc4bf8d277	added question widget (haml2html'ified old code™)	2014-11-02 17:55:47 +01:00