Commit Graph

143 Commits

Author SHA1 Message Date
Yuki 2e6ffdaab7 basic implementation 2015-05-08 21:14:16 +05:30
pixeldesu 42b41a268b fix not shown ban reason 2015-05-05 18:09:26 +02:00
Georg G. 9b39491d88 Merge pull request #18 from skiprope/temp-bans
Support for ban reasons and ban times.
2015-05-05 16:54:23 +02:00
Yuki 8b88827a00 Fix retrospring/bugs#43 2015-05-05 02:36:57 +05:30
Yuki 2204227273 Feature-comment-smiles complete (fix Retrospring/bugs#42) 2015-05-04 07:09:47 +05:30
Yuki 9688b7ee48 Merge stable 2015-04-28 10:22:54 +05:30
Yuki ac14fefb3c Check privilege 2015-04-26 07:09:51 +05:30
Yuki ee29e1f28f Reporting and Deleting logic 2015-04-26 07:06:25 +05:30
Yuki 0bb3895ce8 Small fixes 2015-04-24 00:51:58 +05:30
Yuki 407595c12b Missing return statement 2015-04-23 06:31:48 +05:30
Yuki be04d3528c Support for ban reasons and ban times. Fixes Retrospring/bugs#26 and Retrospring/bugs#25 2015-04-23 06:26:29 +05:30
Yuki b9bf0b04b6 Add support for report reasons 2015-04-22 08:29:10 +05:30
Yuki ecffd07344 Support for post subscriptions 2015-04-21 06:42:11 +05:30
Georg G ced880fe34 made contributor badge changable via web interface 2015-04-19 22:25:04 +02:00
Georg G 141db2e521 Merge branch 'master' of github.com:Retrospring/retrospring 2015-04-19 00:43:04 +02:00
Georg G 399bdf21ee include MarkdownHelper 2015-04-19 00:42:58 +02:00
Yuki e2bfc26c75 Markdown preview through AJAX (/ajax/preview) 2015-04-19 03:47:13 +05:30
Andreas N c50531c988 Merge remote-tracking branch 'remotes/origin/texts' into develop 2015-02-16 18:59:59 +01:00
Georg G cb606f942a fixed pagination for real 2015-02-12 22:09:11 +01:00
nilsding 5c2d75ece9 now marking multiple "smiled" and "commented" notifications as read at once 2015-02-12 17:49:05 +01:00
nilsding 31d8e68725 automatically mark notifications as read 2015-02-10 06:53:50 +01:00
Georg G 06cc52ffc5 made these checkboxes work 2015-02-03 17:48:30 +01:00
nilsding 44b4e8721a alright 2015-01-17 19:53:34 +01:00
nilsding 4a8005b195 closes issue #64 2015-01-17 19:49:11 +01:00
nilsding 2ffd514bf1 forgot the @ 2015-01-17 19:14:18 +01:00
nilsding 1c26af4c8c @group now holds the current group 2015-01-17 19:07:31 +01:00
nilsding 927ec9678f deleting groups works now! finally!!! 2015-01-17 18:57:23 +01:00
nilsding a0d0731a6b creating groups works now. 2015-01-17 18:24:36 +01:00
nilsding dd6af3f651 adding and removing users to/from groups works now 2015-01-17 17:50:25 +01:00
Andreas N 74e74dedef added terms of service 2015-01-16 23:16:28 +01:00
Andreas N 75ae141759 added privacy policy 2015-01-16 22:36:39 +01:00
nilsding f907c4b5a8 returning 404 if group was not found 2015-01-13 23:21:16 +01:00
nilsding a05d763b75 selecting the group from the ask followers modal works now. 2015-01-13 15:45:32 +01:00
nilsding a8ed21942e added group_timelines 2015-01-13 13:23:12 +01:00
nilsding eaa4096af5 Merge branch 'master' into groups
Conflicts:
	db/schema.rb
2015-01-13 07:05:11 +01:00
nilsding 1bb369aa7d implemented basic functionality of YE OLDE BANHAMMER! 2015-01-12 22:44:13 +01:00
nilsding 011150ba17 added a lock icon 2015-01-12 07:08:06 +01:00
nilsding f93624fa2c added groups route thing 2015-01-12 06:57:43 +01:00
nilsding 181a6b72b0 pagination for notifications 2015-01-08 18:22:27 +01:00
Andreas N 4161002da0 added faq page 2015-01-07 21:30:52 +01:00
nilsding 9e0abc342a redirect to login page 2015-01-03 22:48:59 +01:00
nilsding 59b431513b made privacy_allow_stranger_answers work 2015-01-03 22:37:10 +01:00
nilsding 997430f909 opting-out of the public timeline works now 2015-01-03 22:30:40 +01:00
nilsding bc94a729a6 users now can enable/disable some privacy settings 2015-01-03 21:58:56 +01:00
nilsding fd4e66bb75 Merge branch 'master' into privacy 2015-01-03 20:28:20 +01:00
nilsding 81becddbd5 added pagination to answers 2015-01-03 19:24:51 +01:00
nilsding f53ca1b449 the new answer is now shown 2015-01-03 19:14:26 +01:00
nilsding 88b71d8f31 added render of the answerbox to the response 2015-01-03 18:56:06 +01:00
nilsding e37907f948 removed unnecessary puts 2015-01-03 18:42:24 +01:00
nilsding 7be7de11cd moved answering code from inbox_controller.rb to answer_controller.rb 2015-01-03 18:40:39 +01:00