Commit Graph

586 Commits

Author SHA1 Message Date
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
nilsding 02cb318142 8) 2014-12-27 03:49:54 +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
pixeldesu ac91b911ab Merge branch 'master' of git.rrerr.net:justask/justask 2014-12-26 15:33:00 +01:00
pixeldesu 32ace00f84 forgot the extra profile pages 2014-12-26 15:32:53 +01:00
nilsding da8e76edb0 added follow user spec 2014-12-26 15:28:53 +01:00
nilsding a2c361b5c5 made railsadmin shut up about the different notification types 2014-12-26 14:31:59 +01:00
nilsding cb003ce36d added link to moderation panel in navbar 2014-12-26 14:09:07 +01:00
pixeldesu 40dc6a140d fix margin if content is empty 2014-12-26 13:48:20 +01:00