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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								72b7a0797e
								
							
						 | 
						
							
							
								
								Use Mastodon API views in Admin API
							
							
							
							
							
						 | 
						
							2019-02-28 17:43:09 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								90d0d055fc
								
							
						 | 
						
							
							
								
								Add more admin actions
							
							
							
							
							
						 | 
						
							2019-02-27 00:13:38 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								50d6183893
								
							
						 | 
						
							
							
								
								Split hide_network into hide_followers & hide_followings
							
							
							
							
							
						 | 
						
							2019-01-28 21:40:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4333fea1dc
								
							
						 | 
						
							
							
								
								Send "hide_network" in user_view
							
							
							
							
							
						 | 
						
							2019-01-23 19:47:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								90e157ef80
								
							
						 | 
						
							
							
								
								Merge branch 'features/admin-api-user-views' into 'develop'
							
							
							
							
							
							
							
							User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589 
							
						 | 
						
							2018-12-31 15:49:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a41786624
								
							
						 | 
						
							
							
								
								[#467] Refactored valid / invalid user rendering.
							
							
							
							
							
						 | 
						
							2018-12-28 22:47:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b43d630f30
								
							
						 | 
						
							
							
								
								Web.TwitterAPI.UserView: Add rights.admin
							
							
							
							
							
						 | 
						
							2018-12-28 17:38:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d1788ce44
								
							
						 | 
						
							
							
								
								[#471] Factored out User.visible_for?/2.
							
							
							
							
							
						 | 
						
							2018-12-28 14:35:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6aeb1d4a5
								
							
						 | 
						
							
							
								
								[#471] Prevented rendering of inactive local accounts.
							
							
							
							
							
						 | 
						
							2018-12-27 15:46:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aed0f90287
								
							
						 | 
						
							
							
								
								[#114] Added pleroma.confirmation_pending to user views, adjusted view tests.
							
							
							
							
							
						 | 
						
							2018-12-18 17:22:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									raeno
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc87880488
								
							
						 | 
						
							
							
								
								Support both OAuth token record and token string in UserView
							
							
							
							
							
						 | 
						
							2018-12-17 16:02:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a2162bbcb
								
							
						 | 
						
							
							
								
								[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
							
							
							
							
							
						 | 
						
							2018-12-06 22:26:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bcb6a183a
								
							
						 | 
						
							
							
								
								[#394] Refactoring.
							
							
							
							
							
						 | 
						
							2018-12-06 20:23:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b19487389
								
							
						 | 
						
							
							
								
								[#394] Added users.tags and admin routes to tag and untag users. Added tests.
							
							
							
							
							
						 | 
						
							2018-12-06 20:06:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fbb70d25fe
								
							
						 | 
						
							
							
								
								Several twitter api fixes.
							
							
							
							
							
						 | 
						
							2018-11-18 22:36:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb6fd73861
								
							
						 | 
						
							
							
								
								Twitter API: Fall back to user.nickname if user has no name
							
							
							
							
							
						 | 
						
							2018-11-12 15:52:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								82b57ebad1
								
							
						 | 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
							
							
							
							
							
						 | 
						
							2018-09-28 10:44:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								56577d8b48
								
							
						 | 
						
							
							
								
								twitter api: add no_rich_text option to userview for account prefs
							
							
							
							
							
						 | 
						
							2018-09-22 03:24:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f5b026548
								
							
						 | 
						
							
							
								
								twitter api: add support for user-specified html policy
							
							
							
							
							
						 | 
						
							2018-09-22 02:53:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e82ce2a4b3
								
							
						 | 
						
							
							
								
								formatting
							
							
							
							
							
						 | 
						
							2018-09-10 00:28:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac486fc59b
								
							
						 | 
						
							
							
								
								everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
							
							
							
							
							
						 | 
						
							2018-09-10 00:14:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								643f373514
								
							
						 | 
						
							
							
								
								Run mix format
							
							
							
							
							
						 | 
						
							2018-08-22 12:09:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d5bdd55b5d
								
							
						 | 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
							
							
							
							
							
						 | 
						
							2018-08-22 01:47:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ensra
								
							 
						 | 
						
							
							
							
							
								
							
							
								5debd7b5cc
								
							
						 | 
						
							
							
								
								Twitter API: Support Mastodon-style bios
							
							
							
							
							
							
							
							(multi-line, with links, and user mentions) 
							
						 | 
						
							2018-08-21 14:03:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								37b802682c
								
							
						 | 
						
							
							
								
								HTML-sanitize usernames before emojifying.
							
							
							
							
							
						 | 
						
							2018-08-09 13:07:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed9738e031
								
							
						 | 
						
							
							
								
								Add tests for emoji in user profiles
							
							
							
							
							
							
							
							Also use the correct field in TwitterAPI... 
							
						 | 
						
							2018-08-08 09:24:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								cee63ad3f7
								
							
						 | 
						
							
							
								
								TwitterAPI user view: add screen_name_html and description_html.
							
							
							
							
							
						 | 
						
							2018-08-08 08:38:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								dcdf7b6686
								
							
						 | 
						
							
							
								
								twitter api: user view: show default message scope if known
							
							
							
							
							
						 | 
						
							2018-06-27 13:15:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba8dab7542
								
							
						 | 
						
							
							
								
								twitterapi: user view: return if an account is locked or not
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4afbef39f4
								
							
						 | 
						
							
							
								
								Format the code.
							
							
							
							
							
						 | 
						
							2018-03-30 15:01:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5bc810c452
								
							
						 | 
						
							
							
								
								Add moderator function.
							
							
							
							
							
						 | 
						
							2018-02-20 18:44:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab83e0de6d
								
							
						 | 
						
							
							
								
								TwitterAPI: Add is_local to user view.
							
							
							
							
							
						 | 
						
							2018-02-01 21:41:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								14b086eec2
								
							
						 | 
						
							
							
								
								Add a default profile picture and banner.
							
							
							
							
							
							
							
							This removes the placehold.it dependency. 
							
						 | 
						
							2018-01-15 22:18:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72f7baa654
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into media-proxy
							
							
							
							
							
						 | 
						
							2017-12-05 14:12:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c40986120
								
							
						 | 
						
							
							
								
								Basic backend chat.
							
							
							
							
							
						 | 
						
							2017-12-04 19:10:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5f35fdcf5d
								
							
						 | 
						
							
							
								
								media proxy: good enough wip
							
							
							
							
							
						 | 
						
							2017-11-28 20:50:34 +01:00 | 
						
						
							
							
							
								
							
							
						 |