| 
								
								
									 lambda | ce9284b36f | Merge branch 'remove-user-activities' into 'develop' [#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008 | 2019-04-02 12:45:29 +00:00 |  | 
				
					
						| 
								
								
									 lambda | b95cf3d490 | Merge branch 'get_by_id' into 'develop' Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010 | 2019-04-02 12:43:28 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 091baf9316 | Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999 | 2019-04-02 10:57:38 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 26d509cc86 | Merge branch 'get_by_id' into 'develop' Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009 | 2019-04-02 10:52:29 +00:00 |  | 
				
					
						| 
								
								
									 cascode | 95c92c49c9 | Fix account lookup for nicknames beginning with numbers | 2019-04-02 10:51:33 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 88d3cb44c3 | replace Repo.get_by(User, nickname: nickname)withUser.get_by_nickname(nickname) | 2019-04-02 17:47:02 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 1b3d921921 | change Repo.get(User, id)=>User.get_by_id(id) | 2019-04-02 17:01:26 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 4212527928 | change Repo.get(Activity, id)=>Activity.get_by_id(id) | 2019-04-02 16:50:31 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | a14742f495 | add user delete_activitiesmix task | 2019-04-02 16:30:11 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | a1869f5272 | Merge remote-tracking branch 'pleroma/develop' into remove-user-activities | 2019-04-02 15:41:30 +07:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f56eef8d8c | router: Add fake identity proof endpoint | 2019-04-02 01:53:38 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6910fb371b | Fixed local MastoFE authentication / force_loginoption. | 2019-04-01 17:25:25 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | cbe09d94d1 | Added force_loginauthentication option (previously applied by default). | 2019-04-01 14:46:50 +03:00 |  | 
				
					
						| 
								
								
									 Egor | 9a39d1d846 | Replace Pleroma.Jobs with pleroma_job_queue | 2019-03-29 12:46:05 +00:00 |  | 
				
					
						| 
								
								
									 eugenijm | 10c81fc902 | Add user show endpoint for Pleroma admin API | 2019-03-27 21:44:15 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 926bf114b7 | Merge branch 'feature/more-user-filters' into 'develop' Add more user filters + move search to its own module
See merge request pleroma/pleroma!982 | 2019-03-27 11:33:13 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | ce6d64bbd8 | Fix missing announces in MastoAPI home timeline Closes #762 | 2019-03-27 12:28:53 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 3cf7539bca | Add more user filters + move search to its own module | 2019-03-27 03:51:59 +05:00 |  | 
				
					
						| 
								
								
									 eugenijm | a4ab60ac54 | Add vapid_key to the POST /api/v1/appsresponse | 2019-03-26 23:27:37 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 691d1208b5 | Add GET /api/v1/apps/verify_credentials | 2019-03-26 21:53:28 +03:00 |  | 
				
					
						| 
								
								
									 lambda | ff3b09f6b3 | Merge branch 'fix/ap-icon' into 'develop' Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977 | 2019-03-26 16:12:50 +00:00 |  | 
				
					
						| 
								
								
									 lambda | c6ab5ebe7c | Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop' Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979 | 2019-03-26 16:01:52 +00:00 |  | 
				
					
						| 
								
								
									 lain | 10a7a4a868 | AP UserView: Refactor banner / avatar display code, add test. | 2019-03-26 16:59:28 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 9e3899bf36 | Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop' Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978 | 2019-03-26 15:13:55 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 21ff78cd40 | Merge branch 'replies-count' into 'develop' Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974 | 2019-03-26 14:49:09 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 406d19331f | Remove ActivityRepresenter | 2019-03-26 17:16:21 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | eef1042b16 | Mastodon 2.7.2 instance attributes (registrations, languages). | 2019-03-26 16:27:17 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 568e348588 | Increment replies_count on replies (MastoAPI) | 2019-03-26 15:27:04 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b0759f821b | Comments split. | 2019-03-26 15:24:29 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 263ca3dea2 | Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true. | 2019-03-26 15:09:06 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | c410296120 | Try sending an empty map | 2019-03-25 19:00:35 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 6f090f981b | Attempt to fix incorrect federation of default instance avatars | 2019-03-25 18:47:04 -05:00 |  | 
				
					
						| 
								
								
									 rinpatch | b028b0f97d | Merge branch 'bugfix/missing-announces' into 'develop' fix up missing announcements with preloads
See merge request pleroma/pleroma!972 | 2019-03-25 09:24:08 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 26b0c802c3 | fix up missing announcements with preloads | 2019-03-25 07:38:09 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | bc14c98de1 | Merge branch 'features/s3-uploader-digital-ocean' into 'develop' add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969 | 2019-03-25 02:25:59 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 63ffa4842c | Merge branch 'fix/mastoapi-liked' into 'develop' Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970 | 2019-03-25 02:24:27 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | a7f58b3c13 | Serve non-public activities in /api/v1/favourites Fixes #648 | 2019-03-25 02:15:45 +03:00 |  | 
				
					
						| 
								
								
									 Austin Lanari | 6c96d68f77 | add overriding truncated_namespace condition for truncating paths for digital ocean | 2019-03-24 11:32:09 -07:00 |  | 
				
					
						| 
								
								
									 rinpatch | 750de7d842 | Merge branch 'features/mrf-keyword-nil-summary' into 'develop' mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968 | 2019-03-24 15:02:13 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | eab9425cc4 | mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil | 2019-03-24 15:47:50 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4aa699271c | activity: use left join instead of inner join when fetching activities that may or may not have a child object | 2019-03-23 03:17:50 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 332dc1371b | user: use preloads when deleting accounts | 2019-03-23 03:06:00 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | debf7f016d | ostatus: use preload objects with Object.normalize() when opportunistic | 2019-03-23 03:05:57 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3c2350cbee | object: downgrade normalize warning to debug severity | 2019-03-23 03:05:15 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 8c70156157 | activitypub: object view: use preloaded object when possible | 2019-03-23 03:05:14 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f9d5c13b21 | activity: add get_by_ap_id_with_object() | 2019-03-23 03:05:13 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ce47eb8b29 | activitypub: when fetching objects, use the preloaded object from the synthesized activity | 2019-03-23 03:05:10 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | aabcecb269 | notification: formatting | 2019-03-23 02:30:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 07cdd9ed02 | streamer: use the preloaded object if possible | 2019-03-23 02:29:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c62220c500 | rich media: helpers: only crawl Create activities | 2019-03-23 02:28:59 +00:00 |  |