| 
								
								
									 Sergey Suprunenko | 9dd36e5bcb | Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) | 2019-04-23 02:47:43 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 2359ee38b3 | Set digest emails to false by default | 2019-04-21 16:36:25 +07:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 371a4aed2c | Add User.Info.email_notifications | 2019-04-13 17:40:42 +07:00 |  | 
				
					
						| 
								
								
									 Sadposter | be8350baa2 | Merge branch 'develop' into feature/user-status-subscriptions | 2019-04-10 10:44:54 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 9ca91cbb87 | Change relationship direction of subscriptions | 2019-04-05 17:02:07 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 007762e767 | Add notification checks | 2019-04-05 15:30:23 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 79910ce5cc | Add API endpoints and user column for subscription | 2019-04-05 15:30:18 +01:00 |  | 
				
					
						| 
								
								
									 eugenijm | cd90695a34 | Add PUT /api/pleroma/notification_settings endpoint | 2019-03-28 18:55:16 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 55d086b520 | Notification controls Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances | 2019-03-28 07:52:07 +03:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 094e1ef048 | formatting | 2019-03-15 14:28:14 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | da53c079db | Refactor to store user ap_id, add tests | 2019-03-15 14:20:08 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | c8f31e0bc2 | Implement mastodon's reblog hiding feature | 2019-03-15 14:18:21 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | fb82f6fc7c | [Credo] Remove parentesis on argument-less functions | 2019-03-13 04:26:56 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 25eb6cf1cb | Add "roles" to users admin API | 2019-03-12 22:15:28 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | d5418e9ff7 | Remove follow_request_count as it's not needed for FE anymore. MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load. | 2019-03-03 18:42:27 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | 5a46d37af9 | Update the mute implementation to the current codebase Make it part of the info thing (and do a migration to ensure it's there) | 2019-02-19 23:09:16 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | c23bd05737 | Merge branch 'features/flavour-switching' into 'develop' [MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807 | 2019-02-18 04:01:51 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | cd019a5927 | Merge branch 'follow-request-count' into 'develop' Follow request count
See merge request pleroma/pleroma!817 | 2019-02-18 04:01:26 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 4df455f69b | [MastoAPI] Add switching of frontend flavours | 2019-02-16 19:50:13 +01:00 |  | 
				
					
						| 
								
								
									 lain | 269d3e1ca6 | WelcomeMessage: Get rid of Ecto reference. | 2019-02-16 17:24:48 +01:00 |  | 
				
					
						| 
								
								
									 lain | d812a347ca | Add optional welcome message. | 2019-02-16 16:42:34 +01:00 |  | 
				
					
						| 
								
								
									 eugenijm | ecdf0657ba | Add logic for keeping follow_request_count up-to-date on the follow,`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view. | 2019-02-15 12:20:20 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 74518d0b60 | hide_followings was renamed to hide_followers in the FE, but never synced up in the BE This was a dirty regex replace which worked on my server | 2019-02-06 22:34:44 +00:00 |  | 
				
					
						| 
								
								
									 eugenijm | 035eaeb9b8 | Allow to configure visibility for admin and moderator badges | 2019-02-06 06:18:05 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 16ce129e38 | Split hide_network into hide_followers & hide_followings (fixed) | 2019-02-03 21:55:04 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 486749064f | Revert "Merge branch 'feature/split-hide-network' into 'develop'" This reverts merge request !733 | 2019-02-01 20:22:58 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 50d6183893 | Split hide_network into hide_followers & hide_followings | 2019-01-28 21:40:08 +03:00 |  | 
				
					
						| 
								
								
									 href | 973c9eed18 | Treat User.Info pinned ids as strings | 2019-01-23 11:26:37 +01:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 48591aab98 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts # Conflicts:
#	docs/config.md | 2019-01-09 16:56:31 +07:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 0015d43e13 | user: factor out illogical User.Info.superuser?/1. any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching. | 2019-01-09 06:44:50 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 63dbd87568 | rename posttostatus | 2019-01-08 15:25:50 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 380e9fba21 | add pinned posts | 2019-01-07 20:45:33 +07:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 980b5288ed | update copyright years to 2019 | 2018-12-31 15:41:47 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2791ce9a1f | add license boilerplate to pleroma core | 2018-12-23 20:56:42 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 279096228c | [#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users unless requested by admin or moderator. | 2018-12-19 18:56:52 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 968d7490b6 | [#114] User.Info: renamed confirmation_updatetoconfirmation_changeset. | 2018-12-19 16:31:03 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 59fc5d15df | [#114] User.Info: renamed confirmation_updatetoconfirmation_change. | 2018-12-19 16:27:16 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 1de0aa2f10 | [#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed. | 2018-12-18 17:21:05 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a05cb10a95 | [#114] Email confirmation route, action, node setting, User.Info fields. | 2018-12-18 17:18:53 +03:00 |  | 
				
					
						| 
								
								
									 eal | 4c783e35c0 | Mastodon API: Fix PUT /api/web/settings | 2018-12-16 13:15:34 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 2ae1128d9f | MastoAPI: Fix put_settings | 2018-12-06 17:42:07 +03:00 |  | 
				
					
						| 
								
								
									 lain | 7d5720f2e4 | Fix merge. | 2018-12-05 21:31:02 +01:00 |  | 
				
					
						| 
								
								
									 lain | 76d6b1c6ab | Merge remote-tracking branch 'origin' into follower-hiding | 2018-12-05 21:27:56 +01:00 |  | 
				
					
						| 
								
								
									 lain | 839526a913 | TwitterAPI: Add network hiding. | 2018-12-05 19:22:40 +01:00 |  | 
				
					
						| 
								
								
									 lain | 6be0ab1e55 | Hide network in ap. | 2018-12-02 17:35:32 +01:00 |  | 
				
					
						| 
								
								
									 lain | 91065e1968 | Fix background updating / handling. | 2018-12-02 11:20:38 +01:00 |  | 
				
					
						| 
								
								
									 lain | f18b86fd5f | More fixes for Info schema. | 2018-12-01 12:46:08 +01:00 |  | 
				
					
						| 
								
								
									 lain | 93f2dc19d9 | TwitterAPI: Fix banner and background update. | 2018-12-01 12:01:22 +01:00 |  | 
				
					
						| 
								
								
									 lain | 347df6421d | Fix masto api user updating. | 2018-12-01 10:40:01 +01:00 |  | 
				
					
						| 
								
								
									 lain | 1c67277c80 | Fix admin api. | 2018-12-01 09:03:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | 48b95a9b95 | Assorted fixes. | 2018-11-30 17:08:02 +01:00 |  | 
				
					
						| 
								
								
									 lain | d407f662af | Fix TwitterApiController. | 2018-11-30 17:07:37 +01:00 |  | 
				
					
						| 
								
								
									 lain | e002858071 | Fix ostatus test. | 2018-11-27 18:37:46 +01:00 |  | 
				
					
						| 
								
								
									 lain | badbe2656c | More fixes. | 2018-11-27 18:12:03 +01:00 |  | 
				
					
						| 
								
								
									 lain | ec464ef20a | HTTP sig fixes. | 2018-11-27 17:42:45 +01:00 |  | 
				
					
						| 
								
								
									 lain | 0896cf4c0f | Fix most mastodon api bugs. | 2018-11-20 20:12:39 +01:00 |  | 
				
					
						| 
								
								
									 lain | 2887f4ff1d | Fix formatter tests. | 2018-11-20 19:07:01 +01:00 |  | 
				
					
						| 
								
								
									 lain | fbb70d25fe | Several twitter api fixes. | 2018-11-18 22:36:47 +01:00 |  | 
				
					
						| 
								
								
									 lain | 40d9d2098c | Fix user updating from AP. | 2018-11-18 22:15:03 +01:00 |  | 
				
					
						| 
								
								
									 lain | 4c918392c6 | Fix most User tests. | 2018-11-18 21:40:52 +01:00 |  | 
				
					
						| 
								
								
									 lain | e7cd6e9739 | Fix setting of keys. | 2018-11-18 19:33:43 +01:00 |  | 
				
					
						| 
								
								
									 lain | d5af41b577 | Fix note count update. | 2018-11-18 18:52:21 +01:00 |  | 
				
					
						| 
								
								
									 lain | 812f5b058a | Fix blocking. | 2018-11-18 18:40:31 +01:00 |  | 
				
					
						| 
								
								
									 lain | 756764266c | Formatting. | 2018-11-18 18:27:04 +01:00 |  | 
				
					
						| 
								
								
									 lain | b396dba425 | Fix follower count setting. | 2018-11-18 18:24:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | 5c8f07f0a8 | Fix note counting. | 2018-11-18 18:17:56 +01:00 |  | 
				
					
						| 
								
								
									 lain | 50585d051b | Add User.Info module To validate and mutate the user.info field. | 2018-11-18 18:04:42 +01:00 |  |