eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								e416c344dd
								
							
						 | 
						
							
							
								
								Unify unfollow, accept and reject follow requests using CommonAPI
							
							
							
							
							
						 | 
						
							2019-03-13 20:28:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d43b1c0b5d
								
							
						 | 
						
							
							
								
								Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c3d41b2b6e
								
							
						 | 
						
							
							
								
								[Credo] make all variables use snake_case
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4c440f12c3
								
							
						 | 
						
							
							
								
								[Credo] Fix the consistency
							
							
							
							
							
						 | 
						
							2019-03-13 04:17:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								10248d86a2
								
							
						 | 
						
							
							
								
								Merge branch 'unify-follow' into 'develop'
							
							
							
							
							
							
							
							Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889 
							
						 | 
						
							2019-03-04 13:25:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								86e4b48a5e
								
							
						 | 
						
							
							
								
								Fix DM visibility for blocking users
							
							
							
							
							
						 | 
						
							2019-03-04 06:24:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								594694607c
								
							
						 | 
						
							
							
								
								Unify Mastodon and Twitter follow implementations using CommonAPI
							
							
							
							
							
						 | 
						
							2019-03-04 01:00:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c6a2dbfdd
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
							
							
							
							
							
							
							
							Add pagination and search to users
See merge request pleroma/pleroma!873 
							
						 | 
						
							2019-03-03 15:59:15 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b63fda9c7
								
							
						 | 
						
							
							
								
								Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
							
							
							
							
							
							
							
							[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877 
							
						 | 
						
							2019-03-03 11:13:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b08b470f6
								
							
						 | 
						
							
							
								
								Add "local" params to users search
							
							
							
							
							
						 | 
						
							2019-03-01 20:13:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f00814475
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
							
							
							
							
							
							
							
							Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860 
							
						 | 
						
							2019-03-01 09:48:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1341ee650e
								
							
						 | 
						
							
							
								
								[#675] Do not show DMs in mentions timeline
							
							
							
							
							
						 | 
						
							2019-03-01 09:37:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								72b7a0797e
								
							
						 | 
						
							
							
								
								Use Mastodon API views in Admin API
							
							
							
							
							
						 | 
						
							2019-02-28 17:43:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf426a719d
								
							
						 | 
						
							
							
								
								Merge branch 'with-mutes' into 'develop'
							
							
							
							
							
							
							
							Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872 
							
						 | 
						
							2019-02-28 10:22:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b11011039
								
							
						 | 
						
							
							
								
								Added deactivated to the user view
							
							
							
							
							
						 | 
						
							2019-02-28 09:08:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2883f75a3a
								
							
						 | 
						
							
							
								
								Add pagination to users admin API
							
							
							
							
							
						 | 
						
							2019-02-28 01:11:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbbdbec4fd
								
							
						 | 
						
							
							
								
								Remove parts of the old activity view.
							
							
							
							
							
							
							
							Not used anymore. 
							
						 | 
						
							2019-02-27 17:24:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ade1242c2
								
							
						 | 
						
							
							
								
								Add user muted status info to twitterapi.
							
							
							
							
							
						 | 
						
							2019-02-27 16:52:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								90d0d055fc
								
							
						 | 
						
							
							
								
								Add more admin actions
							
							
							
							
							
						 | 
						
							2019-02-27 00:13:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									11backslashes
								
							 
						 | 
						
							
							
							
							
								
							
							
								efa506b874
								
							
						 | 
						
							
							
								
								delegate user retrieval to the User module
							
							
							
							
							
						 | 
						
							2019-02-24 13:23:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0686efa6
								
							
						 | 
						
							
							
								
								Move visibility into own module.
							
							
							
							
							
						 | 
						
							2019-02-22 13:29:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								bff9eb5ef7
								
							
						 | 
						
							
							
								
								Reports
							
							
							
							
							
						 | 
						
							2019-02-20 16:51:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								7456338ed3
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
							
							
							
							
							
							
							
							Add OAuth tokens endpoint
See merge request pleroma/pleroma!805 
							
						 | 
						
							2019-02-18 04:02:41 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								94708d6370
								
							
						 | 
						
							
							
								
								Render only "id", "valid_until" and "app_name" in TokenView
							
							
							
							
							
						 | 
						
							2019-02-17 23:57:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								38e15930cb
								
							
						 | 
						
							
							
								
								Add option to return all friends in twitter api.
							
							
							
							
							
							
							
							Mainly useful for user export. 
							
						 | 
						
							2019-02-16 17:01:15 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								62a45bdc11
								
							
						 | 
						
							
							
								
								Add revoke token
							
							
							
							
							
						 | 
						
							2019-02-13 12:59:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								61a4bc5095
								
							
						 | 
						
							
							
								
								Add OAuth tokens endpoint
							
							
							
							
							
						 | 
						
							2019-02-13 12:59:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								d53e36bf1e
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'object-creation' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !802 
							
						 | 
						
							2019-02-11 08:07:39 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c8d15da11
								
							
						 | 
						
							
							
								
								Merge branch 'fix/credo-issues' into 'develop'
							
							
							
							
							
							
							
							Fix credo issues
See merge request pleroma/pleroma!786 
							
						 | 
						
							2019-02-10 20:54:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8388be9c6
								
							
						 | 
						
							
							
								
								Do object insertion through Cachex
							
							
							
							
							
							
							
							So we don't flood our postgres logs with errors. Should also make things
slightly faster. 
							
						 | 
						
							2019-02-09 22:01:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								60ea29dfe6
								
							
						 | 
						
							
							
								
								Credo fixes: alias grouping/ordering
							
							
							
							
							
						 | 
						
							2019-02-09 14:59:20 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								398c81f9c8
								
							
						 | 
						
							
							
								
								Add is_admin and is_moderator boolean fields to the user view
							
							
							
							
							
						 | 
						
							2019-02-06 02:10:06 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a82a7e6d6
								
							
						 | 
						
							
							
								
								Merge branch 'feature/split-hide-network' into 'develop'
							
							
							
							
							
							
							
							Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733 
							
						 | 
						
							2019-02-01 17:05:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								d03a116654
								
							
						 | 
						
							
							
								
								Merge branch 'hj-happiness-improvement' into 'develop'
							
							
							
							
							
							
							
							New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700 
							
						 | 
						
							2019-01-29 13:54:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								50d6183893
								
							
						 | 
						
							
							
								
								Split hide_network into hide_followers & hide_followings
							
							
							
							
							
						 | 
						
							2019-01-28 21:40:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e8a1e1ba8
								
							
						 | 
						
							
							
								
								Return new-style config if old-style config is set to false.
							
							
							
							
							
							
							
							This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well. 
							
						 | 
						
							2019-01-28 13:07:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e42251e06
								
							
						 | 
						
							
							
								
								rich media: add helpers module, use instead of MastodonAPI module
							
							
							
							
							
						 | 
						
							2019-01-28 06:04:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								07a9a891ad
								
							
						 | 
						
							
							
								
								twitter api: fix up activity representer
							
							
							
							
							
						 | 
						
							2019-01-28 05:53:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d895093fd
								
							
						 | 
						
							
							
								
								twitter api: embed card in twitterapi posts
							
							
							
							
							
						 | 
						
							2019-01-28 05:53:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f83bae7c22
								
							
						 | 
						
							
							
								
								Views: wrap activity rendering in a rescue
							
							
							
							
							
							
							
							this avoids complete timeline breakage when an activity fucks up
rendering. 
							
						 | 
						
							2019-01-27 19:16:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c99b6d35a
								
							
						 | 
						
							
							
								
								Merge branch 'fix/tusky-dm' into 'develop'
							
							
							
							
							
							
							
							Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683 
							
						 | 
						
							2019-01-25 05:19:32 +00:00 | 
						
						
							
							
							
								
							
							
						 |