Commit Graph

104 Commits

Author SHA1 Message Date
Andreas N 57f469e429 you can report yourself anymore in comments 2015-01-02 00:41:26 +01:00
Andreas N ed9c7e945d you can report yourself anymore 2015-01-02 00:38:59 +01:00
nilsding b3f165b12b reporting and deleting comments works now 2014-12-28 21:14:01 +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
Andreas N 56441a4967 more fix. 2014-12-27 16:03:09 +01:00
nilsding 642d88da07 , 2014-12-27 15:56:34 +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 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