Commit Graph

666 Commits

Author SHA1 Message Date
Andreas Nedbal 96309eb8ba Move all modals into shared views/modal directory 2020-04-25 15:16:45 +02:00
Georg Gadinger 445d9ebe2a Fix user questions page 2020-04-23 03:31:07 +02:00
Georg Gadinger 101b3b68d3 Use cursored pagination, remove WillPaginate 2020-04-20 23:13:24 +02:00
Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements
# Conflicts:
#	db/schema.rb
2020-04-19 21:52:58 +01:00
Karina Kwiatek a505e7ee71 Ensure we're logged in as an admin when using the AnnouncementController 2020-04-19 21:45:07 +01:00
Karina Kwiatek b6d6c1fded Add announcements to the top of the application template 2020-04-19 21:38:21 +01:00
Georg Gadinger 946bb3ae9d Use Rolify for admin and moderator roles 2020-04-19 22:35:58 +02:00
Karina Kwiatek 473f2cdcc5 Show announcement validation errors on the frontend 2020-04-19 21:26:55 +01:00
Karina Kwiatek 6187cb0b6c Add the ability to edit announcements 2020-04-19 20:58:57 +01:00
Karina Kwiatek f14a168bce Implement deletion of announcements 2020-04-19 20:50:33 +01:00
Karina Kwiatek e3b89f7346 Implement creation of announcements 2020-04-19 20:34:48 +01:00
Karina Kwiatek 8a632a09cd Create Announcement model & controller 2020-04-19 20:12:22 +01:00
Georg Gadinger 8b129bbbf4 Fix moderation panel. 2020-04-19 18:33:20 +02:00
Georg Gadinger 6f6ac3cc7d Merge remote-tracking branch 'origin/master' into rails5 2020-04-19 14:32:47 +02:00
Georg Gadinger 9fa8ef1501 enable 'Discover' page for mods 2020-04-19 13:55:13 +02:00
Karina Kwiatek a19402af41 Upgrade to Rails 5.2 2020-04-19 00:45:50 +01:00
Georg Gadinger d47991f379 Fixes for devise 4.x 2019-03-29 22:37:10 +01:00
Georg G 0deb4c4ccc added export view/controller/routes 2016-01-05 20:54:38 +01:00
Yuki e510a6e8b4 Do you feel it, Mr. Krabs? 2015-09-18 18:09:26 +09:00
Yuki c107cb19cb LEEDLE LEEDLE LEEE 2015-09-18 18:08:08 +09:00
Yuki 64ba41d9a6 Fix reports 2015-09-18 18:02:16 +09:00
pixeldesu ede3ad1b92 Update notification design and behaviour
- Add display of content that was replied to/with
- Instead of marking notifications new, only show new items and hide seen entries
- Add a 'New Notifications' page and set it as default
- Add proper display if there are no new notifications
- Adjust theme to fit new changes
2015-09-16 22:18:40 +02:00
Yuki 8cbd85a89c the copy paste is strong 2015-09-01 18:48:56 +05:30
Yuki 4b891b3f70 Fix dangerous send exploit 2015-09-01 18:44:50 +05:30
Yuki 5d3d3a68e7 Fix remote code execution exploit 2015-09-01 18:44:31 +05:30
pixeldesu a9ad31b285 move check if user is logged in out of template 2015-08-28 16:36:49 +02:00
Yuki 71caf3cce5 Several changes to theming, solving a bunch of bugs 2015-08-27 05:30:26 +05:30
Yuki a7c3acea76 ISHYGDDT 2015-08-26 02:14:14 +05:30
Yuki c2da575955 invalid is invalid 2015-08-26 01:20:17 +05:30
Yuki 2e0a00e461 Braces 2015-08-26 00:50:18 +05:30
Yuki 7c68b2a167 PRODUCTION V DEVELOPMENT, ROUND 3 FIGHT 2015-08-26 00:45:08 +05:30
Yuki 906692e78f Theming is finished
Previews, settings pane and presets!
2015-08-25 23:57:06 +05:30
Yuki 1912fc3766 Model goop
also made the theme selection logic for user profiles and current user, and the saving logic
2015-08-25 13:56:36 +05:30
Yuki 47344a5774 ThemeHelper.render_theme_with_context 2015-07-29 22:24:33 +05:30
Yuki aec452cbd1 CSS -> SCSS 2015-07-29 22:01:34 +05:30
Yuki 9ef71a84e9 Merge branch 'master' of github.com:Retrospring/retrospring into feature-themes 2015-07-29 19:52:14 +05:30
Yuki 26a517a650 Fixes, workers now output to sidekiq, not rails 2015-07-27 12:42:12 +05:30
Yuki 92bbfef2df Moved ask all + ask group to worker, validates user_id for ask person now 2015-07-27 12:29:56 +05:30
Yuki 54b051a7e7 Temp. layout for testing 2015-07-24 22:42:14 +05:30
Yuki 3b0646644a Replace @users with Hash 2015-07-24 01:14:20 +05:30
Yuki 2aef9bd71f Support for Ruby 2.0.0 2015-07-24 01:13:39 +05:30
Yuki deb6d12108 Moderation Priority + IP 2015-07-23 23:21:13 +05:30
pixeldesu 36d6cd5816 remove strict case requirement 2015-07-17 22:46:05 +02:00
pixeldesu 19d6ccd855 change logic for deletion when no user or no question is found 2015-07-17 22:31:10 +02:00
pixeldesu 0044430fa6 fix indentation 2015-07-17 21:59:16 +02:00
pixeldesu 68526bfc4e removing unnecessary return values 2015-07-17 21:48:33 +02:00
pixeldesu e1d38ebb89 removing more logic from templates + simpler coffeescript 2015-07-17 21:45:45 +02:00
pixeldesu 8232aa2a21 fix flashes staying on the page 2015-07-17 21:34:53 +02:00
pixeldesu 84f80c824e fix broken pagination and wrong question count for deletion 2015-07-17 20:54:11 +02:00
pixeldesu e9ae442431 add ability to show/search questions from specific users 2015-07-17 20:29:19 +02:00
pixeldesu 3a5dcbcd3b Move account deletion to Sidekiq worker, fixes #11 2015-07-15 01:44:35 +02:00
Yuki af71f1ef34 Some adjustmenets to locale logic, add 'jp.language: 日本語', regenerate schema 2015-07-04 13:01:46 +05:30
Yuki 409c82b5ed Flag switcher 2015-06-21 12:33:29 +05:30
pixeldesu 58e80919df add data page 2015-06-20 20:38:07 +02:00
pixeldesu c1faf41305 added translator badge to profiles 2015-06-19 14:46:23 +02:00
Yuki 43825a0951 Rename locale cookie 2015-06-11 07:36:33 +05:30
Yuki c358c34043 HAHA EVERYONE GOT FRENCH BECAUSE I USED A DEPENDENCY, SERVES ME RIGHT 2015-06-10 01:06:47 +05:30
pixeldesu 0aeab3b7f7 fix merge conflict 2015-06-08 22:17:14 +02:00
pixeldesu 984abbe738 git localize flashes 2015-06-07 19:03:57 +02:00
pixeldesu e6e1d03187 localized ajax controllers 2015-06-07 18:24:01 +02:00
Yuki ce2323d675 fix tests 2015-06-07 06:27:21 +05:30
Yuki d11b16dad6 Possibly fix /ajax/preview 2015-06-06 05:57:15 +05:30
Yuki 50e1186e79 Accept-Language header support 2015-05-27 07:06:18 +05:30
Yuki c6028f8dee [skip ci] fix comments 2015-05-26 09:01:06 +05:30
Yuki 69a1bb32f4 Basic locale check 2015-05-26 08:56:40 +05:30
pixeldesu 4400779d00 add Most Comments and Most Answered to Discover 2015-05-18 00:57:47 +02:00
Yuki 6c48e47f2c Only show people that have asked at least 1 question (Discover) 2015-05-15 10:25:26 +05:30
Georg G 140e5bf51e added some querying magic :neckbeard: 2015-05-13 21:58:00 +02:00
pixeldesu 961ebfd266 add routes and empty index for discover 2015-05-13 20:56:51 +02:00
Georg G c9a268ebdf added empty DiscoverController 2015-05-13 20:39:04 +02:00
Georg G 91be970cb9 fixed profile headers 2015-05-10 02:57:18 +02:00
Andreas N. 0145b36510 Merge pull request #22 from Retrospring/profile-headers
Profile headers
2015-05-10 02:22:30 +02:00
Yuki 05ca42c819 Fix Retrospring/bugs#49 2015-05-09 05:01:31 +05:30
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
nilsding 74ece9d971 added privacy setting routes
this took me longer than it should have taken
2015-01-02 21:34:56 +01:00
nilsding e7a0d77fd4 changed flash thing 2014-12-29 14:54:32 +01:00
nilsding 3e033cc102 permit more params! 2014-12-29 14:52:06 +01:00
nilsding 678e03deed uploading profile pictures works now 2014-12-29 11:21:43 +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 7a0b3f4af7 added votes for reports 2014-12-28 23:26:16 +01:00
nilsding 40f54fd19a more before_destroy and after_create 2014-12-28 21:58:35 +01:00
nilsding fec91eeb5b before_destroy 2014-12-28 21:34:42 +01:00
nilsding b6c0b1864a moved some code 2014-12-28 21:20:07 +01:00
nilsding 6d81b4a24b FUCK this!!!!! 2014-12-28 21:14:10 +01:00
nilsding b3f165b12b reporting and deleting comments works now 2014-12-28 21:14:01 +01:00
nilsding ce280fffa1 reporting things via ajax works now 2014-12-28 19:55:50 +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 e789fb7e68 finally made that worker work. 2014-12-27 17:33:49 +01:00
pixeldesu 2107ec6270 init moderation controller 2014-12-25 23:00:33 +01:00
nilsding aa9bd028db Merge remote-tracking branch 'origin/inbox' 2014-12-21 15:33:03 +01:00
nilsding 0ddb1a609c the 404 page is shown again if an user was not found 2014-12-21 15:32:49 +01:00
nilsding 1ba34c59d0 added "delete all questions" button thing 2014-12-21 13:41:57 +01:00
nilsding aa3f118332 fixed anonymous questions being shown 2014-12-19 23:12:19 +01:00
Andreas N 46c9ccc0ac question page added 2014-12-19 22:34:24 +01:00
nilsding 6471e3baa5 fixed answers not being deleted 2014-12-15 19:19:26 +01:00
nilsding 778c1eaccb bugFuchs 2014-12-14 17:21:15 +01:00
nilsding b0a2072f96 made notification tabs work 2014-12-14 15:24:59 +01:00
nilsding c9d57e235f added route for notifications 2014-12-14 15:17:52 +01:00
nilsding 72f0f577a1 case insensitive user names in URLs? why the heck knot! 2014-12-14 12:13:05 +01:00
nilsding 309fa939aa no more thread.new 2014-12-13 16:46:27 +01:00
nilsding 633e133713 sharing now works for real. 2014-12-13 15:38:16 +01:00
nilsding 013d1d44b7 the checkbox should now share to services 2014-12-13 15:17:50 +01:00
nilsding b25c419e52 aw yeah 2014-12-12 23:53:23 +01:00
nilsding 76c614ea66 alright 2014-12-12 23:45:49 +01:00
nilsding 23fc3009fe bugFuchs 2014-12-12 22:35:23 +01:00
nilsding f24433d84e added Services controller 2014-12-12 21:43:09 +01:00
nilsding 54ec828e5b display_all 2014-12-12 18:54:17 +01:00
nilsding b79d4f30ac oy vey 2014-12-12 17:54:13 +01:00
nilsding 2251a21872 added public timeline 2014-12-11 06:39:35 +01:00
nilsding daab6ce4f5 THIS IS SPARTA 2014-12-09 23:21:41 +01:00
pixeldesu f277b249c2 added notification controller 2014-12-09 22:35:11 +01:00
nilsding c18ac74700 renamed following to friends 2014-12-08 19:51:34 +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 4d5cad0c0d , 2014-12-08 17:04:23 +01:00
nilsding 30c8654a27 added follower/following pages 2014-12-08 17:03:06 +01:00
nilsding 72c259bd0d question#content now has a validation. 2014-12-08 15:34:37 +01:00
nilsding 293837984e added pagination to User#show 2014-12-08 15:23:04 +01:00
nilsding c279026ce0 added pagination! (at least on the timeline) 2014-12-08 14:14:13 +01:00
nilsding 7de522a82f added question#show thing and more... 2014-12-07 20:51:44 +01:00
nilsding 58d0efc219 implemented "ask your followers" 2014-12-07 20:13:45 +01:00
nilsding 8ab5458b1b posting comments is now possible. 2014-12-07 15:05:44 +01:00
nilsding 50151453d8 added ajax/comment_controller 2014-12-07 14:31:20 +01:00
nilsding 641fa1ddc3 added show answer thing 2014-12-05 07:02:23 +01:00
nilsding 8b682bd52f added website, bio and location fields to user 2014-12-01 20:47:10 +01:00
nilsding 28df95c089 hnn 2014-11-30 21:08:00 +01:00
nilsding 5b1116e129 the inbox entries are not new anymore ;_; 2014-11-30 21:04:30 +01:00
nilsding 97c197f112 smiles!!! 2014-11-30 20:31:22 +01:00
nilsding ae4952db28 deleting questions from the inbox is now possible 2014-11-30 18:05:51 +01:00
nilsding 842e9059e7 sorting 2014-11-30 16:41:28 +01:00
Georg G be8a9fdc10 Merge branch 'follow-users' into 'master'
Follow users

See merge request !1
2014-11-30 15:40:18 +01:00
nilsding 1b15add6b1 added ajax controller thing 2014-11-30 15:13:37 +01:00
nilsding 4db8f8f33f added some Ajax routes 2014-11-30 14:45:32 +01:00
pixeldesu 409cb8aa66 added team display to about page 2014-11-30 14:21:11 +01:00
nilsding 685b0efe83 added motivation header 2014-11-29 22:34:11 +01:00
nilsding 9728561a93 bugfix 2014-11-28 21:39:38 +01:00
nilsding 6f03b75f00 fixed privileged? method 2014-11-28 21:18:20 +01:00
nilsding 9cc35f90f3 fixed delete button not showing up FOR REAL 2014-11-28 19:25:18 +01:00
nilsding dc83151e65 fixed delete button not showing up 2014-11-28 19:23:54 +01:00
nilsding eed67aeaa2 if an admin deletes an answer it will not show up in the users' inbox again 2014-11-28 14:09:12 +01:00
nilsding 6fb97c9ecc moved privileged? method from answer_controller to application_controller 2014-11-27 11:51:05 +01:00
nilsding 8dff4462cf added (ajax) answer controller 2014-11-26 17:05:46 +01:00
nilsding b1a1c83163 answers are now shown on the user page 2014-11-12 20:40:24 +01:00
nilsding fb48c6d995 finally, setting the display_name works. 2014-11-11 20:20:00 +01:00
nilsding 78bda1fc5f now requiring authentication on certain pages 2014-11-11 19:53:25 +01:00
nilsding a7c9181fc5 fixed fuckups (again) 2014-11-11 18:09:28 +01:00
nilsding ba7bd2239b answering works now. 2014-11-11 18:02:59 +01:00
nilsding 1702c2fca4 added inbox ajax thing 2014-11-11 16:19:20 +01:00
nilsding 0226cff3e4 now incrementing asked_count 2014-11-11 07:18:34 +01:00
nilsding a7f37fb31c added Inbox controller 2014-11-11 07:10:41 +01:00
nilsding abe75c89a2 fixed fuckups™ 2014-11-11 07:08:59 +01:00
nilsding fa96e84239 the user who asked is now stored in the question 2014-11-11 06:51:56 +01:00
nilsding f8c81f679d now actually adding the asked question to the inbox 2014-11-10 23:46:38 +01:00
nilsding ba71902c27 asking questions is now possible! …kinda. 2014-11-10 21:56:30 +01:00
nilsding 8d46fe7843 added ajax controller 2014-11-10 13:03:42 +01:00
nilsding f515bf7bea —€ this. 2014-11-04 15:56:00 +01:00
nilsding d75c381506 goddamn Emacs 2014-11-04 15:33:37 +01:00
nilsding 7ab98b95e1 hhh 2014-11-03 13:21:41 +01:00
nilsding 6630abe7c6 BANG! 2014-11-02 18:16:47 +01:00
nilsding c211b29395 new users controller 2014-11-02 17:57:37 +01:00
nilsding 7641726677 added authentication and everything 2014-08-01 15:27:08 +02:00
nilsding 601b27d3b3 added static pages 2014-08-01 11:47:25 +02:00
nilsding 386066c55b first commit 2014-08-01 11:23:47 +02:00