| 
								
								
									 Egor | b9cdf6d3b9 | Use User.get_cached*everywhere | 2019-04-22 07:20:43 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | a53b917e7f | oof | 2019-04-17 14:55:26 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | ad681877df | Make credo happy | 2019-04-17 14:52:01 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | b09ae02c04 | Added some more normalization calls all in mastodon api controller | 2019-04-17 13:04:58 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 462028688b | Fix pinned posts relying on embded objects | 2019-04-17 12:34:19 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 627e5a0a49 | Merge branch 'develop' into feature/database-compaction | 2019-04-17 12:22:32 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5d73dca064 | Remove inReplyToStatusId | 2019-04-15 11:50:36 +03:00 |  | 
				
					
						| 
								
								
									 Egor | f9af90c5aa | Revert "simplify mentions escape" This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1. | 2019-04-12 19:25:53 +00:00 |  | 
				
					
						| 
								
								
									 Sadposter | be8350baa2 | Merge branch 'develop' into feature/user-status-subscriptions | 2019-04-10 10:44:54 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 589629cf3e | Used cached user resources in subscriptions | 2019-04-08 15:56:14 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 76fdfd1c7f | Add check on activity visibility in sub notification | 2019-04-07 15:11:29 +01:00 |  | 
				
					
						| 
								
								
									 Alex S | 7410aee886 | Merge develop to 770-add-emoji-tags Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs | 2019-04-06 20:34:00 +07:00 |  | 
				
					
						| 
								
								
									 Sadposter | 9ca91cbb87 | Change relationship direction of subscriptions | 2019-04-05 17:02:07 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 316fe20d86 | Make subscriptions the same direction as blocks That being, user - subscribes to -> users, rather than
user - has subscribers -> users | 2019-04-05 15:30:26 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 007762e767 | Add notification checks | 2019-04-05 15:30:23 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | 79cb34a4b0 | Fix preview not being usable in form data | 2019-04-02 23:07:16 +03: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 |  | 
				
					
						| 
								
								
									 Alex S | 9e0567ec52 | Merge develop into feature/770-add-emoji-tags | 2019-04-02 19:16:29 +07: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | b6f9f7b8aa | Handle dates in the Unix timestamp format (Fixes #763) | 2019-04-01 22:45:24 +02:00 |  | 
				
					
						| 
								
								
									 Alex S | 3601f03147 | Adding tag to emoji ets table changes in apis | 2019-04-01 17:17:57 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1bb4d5d65b | Implement fake status submit | 2019-03-29 21:59:04 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a6973a668e | formatting | 2019-03-23 00:28:16 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e75e43b949 | common api: use the optimized Object.normalize whenever possible | 2019-03-23 00:22:14 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 1c3d3d0c2b | Merge branch 'safe-mentions' into 'develop' Add safe dm mode option.
See merge request pleroma/pleroma!958 | 2019-03-22 00:50:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | fea3696799 | common api: move context functions from twitterapi | 2019-03-21 23:24:04 +00:00 |  | 
				
					
						| 
								
								
									 lain | 8468f3f6d4 | Add safe dm mode option. | 2019-03-20 21:09:36 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 6d6f48d079 | Merge branch 'feature/federated-flags' into 'develop' Federated reports
See merge request pleroma/pleroma!935 | 2019-03-16 19:27:56 +00:00 |  | 
				
					
						| 
								
								
									 Karen Konou | da53c079db | Refactor to store user ap_id, add tests | 2019-03-15 14:20:08 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | c8f31e0bc2 | Implement mastodon's reblog hiding feature | 2019-03-15 14:18:21 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 5c7b774f09 | reports: unify sending e-mail for both remote and local reports | 2019-03-14 19:44:08 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3b48d5f0c2 | common api: add support for forwarding reports | 2019-03-14 19:29:33 +00:00 |  | 
				
					
						| 
								
								
									 eugenijm | e416c344dd | Unify unfollow, accept and reject follow requests using CommonAPI | 2019-03-13 20:28:36 +03: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 |  | 
				
					
						| 
								
								
									 eugenijm | 2827dfea50 | Allow an admin to delete a user status | 2019-03-08 20:21:56 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 594694607c | Unify Mastodon and Twitter follow implementations using CommonAPI | 2019-03-04 01:00:37 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5d961d536c | fix formatter | 2019-02-27 15:40:30 +07:00 |  | 
				
					
						| 
								
								
									 Egor | c3ac9424d2 | AutoLinker | 2019-02-26 23:32:26 +00:00 |  | 
				
					
						| 
								
								
									 Egor | bff9eb5ef7 | Reports | 2019-02-20 16:51:25 +00:00 |  | 
				
					
						| 
								
								
									 Wim Vanderbauwhede | 04b1c13554 | Merge remote-tracking branch 'upstream/develop' into patch-image-description | 2019-02-14 16:41:40 +00:00 |  | 
				
					
						| 
								
								
									 Karen Konou | ac72b578da | Merge branch 'develop' into feature/thread-muting | 2019-02-11 12:10:49 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | c01ef574c1 | Refactor as per Rin's suggestions, add endpoint tests | 2019-02-11 12:04:02 +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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 106f4e7a0f | Credo fixes: parameter consistency | 2019-02-09 14:59:20 +01:00 |  |