FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
738 Commits 1 Branch 0 Tags 15 MiB
Commit Graph

400 Commits

Author SHA1 Message Date
nilsding 74ece9d971 added privacy setting routes 
this took me longer than it should have taken
 2015-01-02 21:34:56 +01:00
Andreas N dd21ce344b fixed button, or attempt fix 2015-01-02 17:40:34 +01:00
Andreas N 65445954c8 moved button on different sizes to navbar or right side 2015-01-02 17:27:44 +01:00
Andreas N 97086a8a9a add privacy tab 2015-01-02 01:09:04 +01:00
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
Andreas N dc558902f4 Merge remote-tracking branch 'origin/master' 2015-01-01 19:10:41 +01:00
Andreas N d5b538461e added moderator display to about page 2015-01-01 19:10:31 +01:00
nilsding f6e405c2e9 url: HTTPS! 2015-01-01 18:55:17 +01:00
nilsding 5c0fd6838f hmm? 2015-01-01 18:45:15 +01:00
nilsding 4a49b7fc27 ffffff 2015-01-01 18:19:02 +01:00
nilsding b76a78bdfb also this 2015-01-01 18:17:40 +01:00
nilsding 77b92b0b23 changed a few Devise views 2015-01-01 17:50:25 +01:00
nilsding ed6e91c33f changed about avatar 2015-01-01 17:21:39 +01:00
Andreas N ba0e39e99b Merge remote-tracking branch 'origin/master' 2015-01-01 17:09:30 +01:00
Andreas N 96704c06da updated bugtracker link in about page 2015-01-01 17:09:15 +01:00
nilsding daa8eefff6 temp fix 2014-12-29 22:01:54 +01:00
nilsding fa16612ba8 made the new cropper work 2014-12-29 16:29:46 +01:00
nilsding f7cb3478be :medium everywhere 2014-12-29 14:57:16 +01:00
nilsding b61a631f15 added hidden fields 2014-12-29 14:50:25 +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 678e03deed uploading profile pictures works now 2014-12-29 11:21:43 +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 7d55141a1a added deleted column to reports 2014-12-28 21:34:36 +01:00
nilsding b3f165b12b reporting and deleting comments works now 2014-12-28 21:14:01 +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 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 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 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
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
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
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 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 32ace00f84 forgot the extra profile pages 2014-12-26 15:32:53 +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
pixeldesu e900b794d3 increased sidebar size on profile 2014-12-26 13:45:29 +01:00
nilsding 9e918fa3dc added moderator to users 2014-12-26 13:34:01 +01:00
pixeldesu f403a0a2f8 added tabs, moderation box view and comment display 2014-12-25 23:47:11 +01:00
pixeldesu 32623ec2f2 added basic mod page 2014-12-25 23:14:45 +01:00
pixeldesu 2107ec6270 init moderation controller 2014-12-25 23:00:33 +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 9440eafbe8 Merge branch 'master' of git.rrerr.net:justask/justask 2014-12-25 14:27:24 +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
nilsding 22838ebfda Meymeys 2014-12-21 23:10:26 +01:00
Andreas N 7429aca044 remove br 2014-12-21 23:09:16 +01:00
nilsding 98e9fe098f Meymeys 2014-12-21 23:07:56 +01:00
Andreas N 40b0097149 more fix 2014-12-21 23:07:01 +01:00
Andreas N 6201b7043b how to stupid fix 2014-12-21 23:05:53 +01:00
nilsding b01e1791d4 Merge remote-tracking branch 'origin/inbox' 2014-12-21 23:04:43 +01:00
Andreas N 23af34494e add share on Twitter button 2014-12-21 23:01:21 +01:00