| 
								
								
									 lambda | b4da2bc1d0 | Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' # Conflicts:
#   config/config.exs
#   docs/config.md | 2019-04-08 09:18:01 +00:00 |  | 
				
					
						| 
								
								
									 lambda | b177e1e7f3 | Merge branch 'scheduled-activities' into 'develop' Scheduled activities
See merge request pleroma/pleroma!989 | 2019-04-08 09:08:18 +00:00 |  | 
				
					
						| 
								
								
									 feld | fb2040d061 | Merge branch 'fix/deactivated-user-error' into 'develop' Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031 | 2019-04-06 22:19:30 +00:00 |  | 
				
					
						| 
								
								
									 eugenijm | 2056efa714 | Add scheduler for sending scheduled activities to the queue | 2019-04-06 23:56:29 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | fc92a0fd8d | Added limits and media attachments for scheduled activities. | 2019-04-06 23:55:58 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | b3870df51f | Handle scheduled_aton status creation. | 2019-04-06 23:55:58 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 7bf622ce73 | Add scheduled activities | 2019-04-06 23:55:58 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 7aa53d52bd | Return 403 on oauth token exchange for a deactivated user | 2019-04-06 23:27:55 +03:00 |  | 
				
					
						| 
								
								
									 feld | 9aeac7dcca | Merge branch 'feature/prometheus' into 'develop' Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020 | 2019-04-06 14:51:46 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 325a268017 | Redirect to the referer url after mastofe authorization | 2019-04-05 23:36:42 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | b5a2d384f7 | Redundant Repo.get_by usage was recently removed from the codebase | 2019-04-05 11:41:41 -05:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7895ee37fa | Add user following / unfollowing to the admin api. | 2019-04-05 11:27:07 -05:00 |  | 
				
					
						| 
								
								
									 rinpatch | f0f30019e1 | Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi | 2019-04-05 15:19:44 +03:00 |  | 
				
					
						| 
								
								
									 href | bc3618a38d | Set up telemetry and prometheus | 2019-04-04 11:30:43 -05:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | cfa6e7289f | Improve Transmogrifier.upgrade_user_from_ap_id/2 | 2019-04-04 16:10:43 +07:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | af0065a71f | mastodon_api_controller.ex: Add pleroma-tan to initial_state | 2019-04-04 09:07:25 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 79cb34a4b0 | Fix preview not being usable in form data | 2019-04-02 23:07:16 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 0cb94cfa94 | Merge branch 'fix-slow-relationships' into 'develop' ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011 | 2019-04-02 18:43:48 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 256b492a58 | Merge branch 'bugfix/wrong-date-format' into 'develop' Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004 | 2019-04-02 14:18:23 +00:00 |  | 
				
					
						| 
								
								
									 lambda | a79ce94dd4 | Merge branch 'feature/fake-statuses' into 'develop' Add fake status submit
See merge request pleroma/pleroma!995 | 2019-04-02 14:17:43 +00:00 |  | 
				
					
						| 
								
								
									 lain | 39bcf93007 | Merge remote-tracking branch 'origin/develop' into fix-slow-relationships | 2019-04-02 16:10:38 +02:00 |  | 
				
					
						| 
								
								
									 lain | fd07745d1b | ActivityPub Utils: Greatly speed up the follow / block activity fetching. | 2019-04-02 16:08:55 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 180b87257c | Merge branch 'bugfix/share-mastodon' into 'develop' [OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002 | 2019-04-02 12:47:40 +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 |  | 
				
					
						| 
								
								
									 rinpatch | fdb4357e9b | Rename fake param to preview and make the tests check that the object was not inserted to the db | 2019-04-02 14:31:18 +03: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 3db9235150 | Ignore dates in wrong formats | 2019-04-02 11:32:36 +02:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | f20e8d28de | add support for all status type (ostatus) and replase case with if | 2019-04-02 12:18:00 +05:45 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 6386c1c9c1 | fetch url for OStatus to know if it is a/c or status | 2019-04-02 10:26:09 +05:45 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f56eef8d8c | router: Add fake identity proof endpoint | 2019-04-02 01:53:38 +02:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | b6f9f7b8aa | Handle dates in the Unix timestamp format (Fixes #763) | 2019-04-01 22:45:24 +02:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 1d01e8e656 | [OStatus] adds status to pleroma instance if the url given is a status | 2019-04-01 22:26:58 +05:45 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 rinpatch | fe5145eeaa | Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex | 2019-04-01 12:25:53 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 975482f091 | insert object defaults for fake activities and make credo happy | 2019-04-01 12:16:51 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | d866b59eea | oof | 2019-04-01 11:58:08 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 45ba10bf47 | Fix the issue with HTML scrubber | 2019-04-01 11:55:59 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | cd387f8693 | Add a fake option to lazy_put_actvity_defaults | 2019-03-30 13:57:54 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1bb4d5d65b | Implement fake status submit | 2019-03-29 21:59:04 +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 |  |