| 
								
								
									 Fong-Wan Chau | 4ed2618f6c | Allow 'rel' attribute on <a>link with specific values (for hashtag recognition). | 2019-03-17 11:03:19 -04:00 |  | 
				
					
						| 
								
								
									 eugenijm | 43fb03be5a | Allow to mark a single notification as read | 2019-03-15 23:56:14 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 23960309a0 | [Credo] Change quoted string with 3+ quotes to sigils | 2019-03-13 04:26:56 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | c42d34b2ec | [Credo] fix Credo.Check.Readability.MaxLineLength | 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 | 6c8743d0c0 | [Credo] Fix the warnings | 2019-03-13 04:17:30 +01:00 |  | 
				
					
						| 
								
								
									 eugenijm | 86e4b48a5e | Fix DM visibility for blocking users | 2019-03-04 06:24:27 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 rinpatch | 9c6abec4d8 | use commonapi.post instead of activitybulder | 2019-03-01 15:48:04 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1341ee650e | [#675] Do not show DMs in mentions timeline | 2019-03-01 09:37:29 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 337367d764 | [#468] More OAuth scopes-specific tests. | 2019-02-20 12:27:28 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 04ee877a20 | [#468] Added OAuth scopes-specific tests. | 2019-02-19 22:28:21 +03: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 | fd17a0cc9b | Fix test | 2019-02-18 00:10:48 +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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 8bb7e19b38 | test: de-group alias/es | 2019-02-11 03:44:15 +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 |  | 
				
					
						| 
								
								
									 William Pitcock | 73e6a1f1dd | test: twitterapi: fix another possible test failure case | 2019-02-05 20:08:16 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | eb2b1960e0 | Merge branch 'feature/split-hide-network-v2' into 'develop' Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765 | 2019-02-05 18:56:59 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c4d317ccb6 | test: twitterapi: fix the test breakage for real | 2019-02-05 18:49:02 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 16ce129e38 | Split hide_network into hide_followers & hide_followings (fixed) | 2019-02-03 21:55:04 +03:00 |  | 
				
					
						| 
								
								
									 lain | 505a084058 | Still do caching in tests. | 2019-02-03 18:28:14 +01: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 | 3e968f9ef2 | Format | 2019-01-28 21:40:08 +03: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 | 020b3b29d9 | test: update twitterapi tests | 2019-01-28 05:53:17 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 4df71cd88b | Merge branch 'classic-flakeids' into 'develop' Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645 | 2019-01-25 04:59:06 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 4333fea1dc | Send "hide_network" in user_view | 2019-01-23 19:47:51 +03:00 |  | 
				
					
						| 
								
								
									 lain | e221c681dc | New frontend configuration mechanism. | 2019-01-23 12:40:57 +01:00 |  | 
				
					
						| 
								
								
									 href | 28d77e373c | Flake Ids for Users and Activities | 2019-01-23 11:26:27 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 98c8184c1f | Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1 | 2019-01-21 08:00:41 +01:00 |  | 
				
					
						| 
								
								
									 lambda | f3045a179e | Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop' I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685 | 2019-01-20 10:24:05 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | ed8f55ab8e | [#477] User: FTS and trigram search results mixing (to handle misspelled requests). | 2019-01-18 10:35:45 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 85a5be6220 | tests: fixup | 2019-01-16 04:09:01 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | fc965f982c | [#477] Added FTS index for users. Fixed failing test. | 2019-01-15 12:04:54 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 11d08c6226 | Merge branch 'twapi-follower-pagination' into 'develop' Twapi follower pagination
See merge request pleroma/pleroma!648 | 2019-01-10 18:03:32 +00:00 |  |