akkoma

Author	SHA1	Message	Date
Haelwenn (lanodan) Monnier	cf9ba8fe1b	transmogrifier.ex: Add fix_summary/1 MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway.	2019-04-10 02:32:04 +02:00
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	2019-04-09 23:20:31 +03:00
Sadposter	589629cf3e	Used cached user resources in subscriptions	2019-04-08 15:56:14 +01:00
lain	a9f805c871	Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations	2019-04-08 14:10:51 +02:00
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 18:48:10 +07:00
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	2019-04-08 11:42:20 +00:00
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	2019-04-08 11:41:50 +00:00
Alexander Strizhakov	36c0a10fdf	adding language tag	2019-04-08 11:03:10 +00:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 16:46:59 +07:00
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	2019-04-08 16:29:20 +07:00
Ivan Tashkinov	bffddf5e31	[#923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
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
Alex S	012bb5dcc9	renaming expire_at -> expires_at keyword style change	2019-04-08 16:01:28 +07:00
Sadposter	76fdfd1c7f	Add check on activity visibility in sub notification	2019-04-07 15:11:29 +01:00
Alex S	56c75aec12	credo fix	2019-04-07 20:59:53 +07:00
Alex S	b810aac117	added docs to docs/api/admin_api.md code style and little renamings	2019-04-07 19:48:52 +07:00
Ivan Tashkinov	e3328bc138	[#923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	2019-04-07 11:08:37 +03: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_at` on 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
Sadposter	c05fe4da0a	Document subscription endpoints, fix typos Also adds a quick error case on the subscription endpoints to avoid 500s	2019-04-06 16:20:06 +01: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
Alex S	a53d591ac5	code style	2019-04-06 20:47:05 +07: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
Alex S	dcc54f8cfa	admin api endpoints for invites	2019-04-06 20:25:19 +07:00
Alex S	47b07cec49	token -> invite renaming	2019-04-06 20:24:22 +07:00
Alex S	be54e40890	twitter api registration fix for twitter api tests	2019-04-06 17:18:59 +07: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
Sadposter	9ca91cbb87	Change relationship direction of subscriptions	2019-04-05 17:02:07 +01:00
Sadposter	d35f6551c1	Move subscriptions endpoint to be under /pleroma	2019-04-05 17:02:02 +01:00
Sadposter	d56866c824	Add subscribed status to user view Added in pleroma extensions, but can be moved whenever	2019-04-05 15:30:31 +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	23c4f49494	Fix subscription endpoint return formats	2019-04-05 15:30:24 +01:00
Sadposter	007762e767	Add notification checks	2019-04-05 15:30:23 +01:00
Sadposter	79910ce5cc	Add API endpoints and user column for subscription	2019-04-05 15:30:18 +01:00
Egor Kislitsyn	1c2e4f88d1	fix credo	2019-04-05 19:46:28 +07:00
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	2019-04-05 19:38:44 +07: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
Ivan Tashkinov	47a236f753	[#923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
Ivan Tashkinov	3e7f2bfc2f	[#923 ] OAuthController#callback adjustments (with tests).	2019-04-05 09:19:17 +03:00
Ivan Tashkinov	45765918c3	[#923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts: # mix.exs	2019-04-04 23:43:08 +03:00
Ivan Tashkinov	f7cd9131d4	[#923 ] OAuth consumer controller tests. Misc. improvements.	2019-04-04 22:41:03 +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
Alex S	fa8483cb80	Merging develop into feature/770-add-emoji-tags Conflict test/web/twitter_api/util_controller_test.exs	2019-04-02 20:39:52 +07: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
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
Ivan Tashkinov	37925cbe78	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex	2019-04-02 14:05:34 +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
Ivan Tashkinov	590c935d95	[#923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts: # mix.exs	2019-04-02 13:50:12 +03:00
Egor Kislitsyn	88d3cb44c3	replace `Repo.get_by(User, nickname: nickname)` with `User.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
Ivan Tashkinov	aac48d0cc6	Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations	2019-04-02 09:19:10 +03:00
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_login` option.	2019-04-01 17:25:25 +03:00
Ivan Tashkinov	cbe09d94d1	Added `force_login` authentication option (previously applied by default).	2019-04-01 14:46:50 +03:00
Alex S	3601f03147	Adding tag to emoji ets table changes in apis	2019-04-01 17:17:57 +07: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
Ivan Tashkinov	804173fc92	[#923 ] Minor code readability fix.	2019-04-01 09:45:44 +03:00
Ivan Tashkinov	eadafc88b8	[#923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.	2019-04-01 09:28:56 +03:00
Ivan Tashkinov	baffdcc480	[#923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts: # mix.exs	2019-04-01 08:49:32 +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
Haelwenn (lanodan) Monnier	c8abef373b	mastodon_api_controller.ex: fallback to first for min_id	2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier	6b407872b4	mastodon_api_controller.ex: Use min_id in link header instead of since_id	2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier	6f15224053	activity_pub.ex: Move limit/max_id restrictions to Pagination helpers	2019-03-28 17:18:59 +01:00
eugenijm	cd90695a34	Add PUT /api/pleroma/notification_settings endpoint	2019-03-28 18:55:16 +03:00
eugenijm	10c81fc902	Add user show endpoint for Pleroma admin API	2019-03-27 21:44:15 +03:00
Alex S	3ca6c4f443	password reset page labels align	2019-03-27 22:37:20 +06:30
Ivan Tashkinov	20e0f36605	Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth	2019-03-27 15:41:40 +03:00
Ivan Tashkinov	2a95014b9d	[#923 ] OAuth consumer improvements, fixes, refactoring.	2019-03-27 15:39:35 +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/apps` response	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
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
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	debf7f016d	ostatus: use preload objects with Object.normalize() when opportunistic	2019-03-23 03:05:57 +00:00
William Pitcock	8c70156157	activitypub: object view: use preloaded object when possible	2019-03-23 03:05:14 +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	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
William Pitcock	4cedf45423	relay: use preloaded object since we always have it	2019-03-23 02:28:56 +00:00
William Pitcock	e430a71d37	ostatus: fetch preloaded object in note handler for testsuite	2019-03-23 01:17:26 +00:00
William Pitcock	73efe95368	activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)	2019-03-23 01:09:12 +00:00
William Pitcock	ba7299fc87	activitypub: add missing with_preloaded_object()	2019-03-23 00:53:35 +00:00
William Pitcock	e4307cadc8	activitypub: splice in the child object if we have one	2019-03-23 00:40:08 +00:00
William Pitcock	a6973a668e	formatting	2019-03-23 00:28:16 +00:00
William Pitcock	b3bf523c09	rich media: use optimized Object.normalize()	2019-03-23 00:22:57 +00:00
William Pitcock	e75e43b949	common api: use the optimized Object.normalize whenever possible	2019-03-23 00:22:14 +00:00
William Pitcock	9aea7cc224	activitypub: preload child objects when fetching timelines	2019-03-23 00:10:17 +00:00
rinpatch	1b33986bfa	Fix text being nullable in TwitterAPI	2019-03-23 00:10:50 +03:00
lambda	fee360e581	Merge branch 'safe-mentions' into 'develop' NodeInfo: Return safe_dm_mentions feature flag. See merge request pleroma/pleroma!964	2019-03-22 11:03:56 +00:00
lain	e2afce34b6	NodeInfo: Return safe_dm_mentions feature flag.	2019-03-22 11:57:20 +01: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	3cc2554fa3	mastodon api: add conversation_id extension (ref #674 )	2019-03-21 23:25:41 +00:00
William Pitcock	fea3696799	common api: move context functions from twitterapi	2019-03-21 23:24:04 +00:00
rinpatch	b92a16aa00	Merge branch 'ecto-3-migration' into 'develop' Ecto 3.0.7 (ecto_sql 3.0.5) migration See merge request pleroma/pleroma!957	2019-03-21 16:24:57 +00:00
lain	bf27190f7f	UtilController: Return state of safe dm mentions.	2019-03-21 16:20:58 +01:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
Ivan Tashkinov	af68a42ef7	[#923 ] Support for multiple OAuth consumer strategies.	2019-03-20 20:25:48 +03:00
rinpatch	9a7b817c9a	Ecto 3.0.5 migration kms	2019-03-20 15:59:54 +03:00
Ivan Tashkinov	e17a9a1f66	[#923 ] Nickname & email selection for external registrations, option to connect to existing account.	2019-03-20 10:35:31 +03:00
William Pitcock	1685e4258f	transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection	2019-03-19 18:39:33 +00:00
William Pitcock	cd055983c3	transmogrifier: when determining followers collection URI, we may need to fetch the actor	2019-03-19 18:04:57 +00:00
William Pitcock	d487b753c3	activitypub: transmogrifier: do not allow missing lists to be interpreted as nil	2019-03-19 17:30:25 +00:00
William Pitcock	798da28812	activitypub: transmogrifier: ensure as:Public activities are delivered to followers	2019-03-19 17:27:42 +00:00
Ivan Tashkinov	8d21859717	[#923 ] External User registration refactoring, password randomization.	2019-03-18 18:09:53 +03:00
Ivan Tashkinov	26b6354095	[#923 ] Support for multiple (external) registrations per user via Registration.	2019-03-18 17:23:38 +03:00
Zachary Dunn	5ba14c664b	Fix missing end brace	2019-03-18 14:05:10 +00:00
Zachary Dunn	a2e03d4f3c	Initial attempt at updating return type	2019-03-18 13:56:59 +00:00
eugenijm	1588688a11	Added support for exclude_types, limit, and min_id in Mastodon notifications. Unify Mastodon-compatible pagination logic.	2019-03-18 11:27:27 +03:00
Ivan Tashkinov	2a96283efb	[#923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex	2019-03-18 10:26:41 +03:00
Haelwenn (lanodan) Monnier	f6fab01ba7	Web.Router: Add routes for Conversation mastoAPI	2019-03-17 17:06:28 +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
lambda	28df397454	Merge branch 'feature/oauth-me' into 'develop' oauth: add me property to token responses See merge request pleroma/pleroma!942	2019-03-16 08:44:02 +00:00
kaniini	c69dc2acf1	Merge branch 'feature/reblog-muting' into 'develop' Implement mastodon's reblog hiding feature See merge request pleroma/pleroma!916	2019-03-16 04:31:31 +00:00
William Pitcock	e0edc706cf	oauth: add me property to token responses	2019-03-16 01:12:50 +00:00
eugenijm	43fb03be5a	Allow to mark a single notification as read	2019-03-15 23:56:14 +03:00
kaniini	8b352af4dd	Merge branch 'feature/openldap-support' into 'develop' OpenLDAP support Closes #203 See merge request pleroma/pleroma!859	2019-03-15 19:57:09 +00:00
Ivan Tashkinov	2739057442	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-15 17:11:00 +03:00
Ivan Tashkinov	aacbf0f570	[#923 ] OAuth: prototype of sign in / sign up with Twitter.	2019-03-15 17:08:03 +03:00
Karen Konou	d8244c2a1b	remove unused function	2019-03-15 15:03:03 +01:00
Karen Konou	dfeb3aec44	fix credo warning	2019-03-15 14:36:07 +01:00
Karen Konou	da53c079db	Refactor to store user ap_id, add tests	2019-03-15 14:20:08 +01:00
Karen Konou	be465c762b	formatting	2019-03-15 14:18:53 +01:00
Karen Konou	15b21d1983	refactor filtering mechanism	2019-03-15 14:18:53 +01:00
Karen Konou	aa71139e4a	Fix elixir 1.8 vs 1.7 format conflict	2019-03-15 14:18:53 +01:00
Karen Konou	fe4c1d26fc	Add ActivityPub.contain_activity checks to streamer	2019-03-15 14:18:53 +01:00
Karen Konou	c8f31e0bc2	Implement mastodon's reblog hiding feature	2019-03-15 14:18:21 +01:00
Haelwenn	41fc67aa49	Merge branch 'mastoapi/mime_type' into 'develop' Extend MastoAPI to provide attachment mimetypes See merge request pleroma/pleroma!938	2019-03-15 09:48:50 +00:00
rinpatch	d7a34b604b	Extend MastoAPI to provide attachment mimetypes	2019-03-15 11:58:12 +03:00
kaniini	0f42ea87d6	Merge branch 'notifications-is-seen' into 'develop' MastoAPI notifications is_seen See merge request pleroma/pleroma!934	2019-03-15 02:59:17 +00:00
kaniini	c708656b5e	Merge branch 'robotstxt' into 'develop' Add robots.txt Closes #723 See merge request pleroma/pleroma!929	2019-03-15 02:50:27 +00:00
William Pearson	3dadaa4432	robots.txt Add default robots.txt that allows bots access to all paths. Add mix task to generate robots.txt taht allows bots access to no paths. Document custom emojis, MRF and static_dir static_dir documentation includes docs for the robots.txt Mix task.	2019-03-15 02:28:18 +00:00
eugenijm	100413bf2c	Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests	2019-03-15 01:35:48 +03:00
William Pitcock	423fd07928	activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable	2019-03-14 19:52:08 +00: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	64b0120d67	activitypub: add support for forwarding reports	2019-03-14 19:36:17 +00:00
William Pitcock	3b48d5f0c2	common api: add support for forwarding reports	2019-03-14 19:29:33 +00:00
William Pitcock	379442ad17	activitypub: utils: also match Activity objects	2019-03-14 19:29:04 +00:00
William Pitcock	0f3ecb2bfb	activitypub: transmogrifier: accept remote Flag activities	2019-03-14 19:06:02 +00:00
William Pitcock	f86f7dbb8f	activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs	2019-03-14 19:05:42 +00:00
rinpatch	34fc0dca2e	Merge branch 'hotfix/delete-activities' into 'develop' Fix delete activities not federating See merge request pleroma/pleroma!933	2019-03-14 17:49:00 +00:00
rinpatch	e630e5e135	Fix delete activities not federating	2019-03-14 20:43:14 +03:00
link0ff	54e7087ab4	Merge remote-tracking branch 'upstream/develop' into feature/openldap-support	2019-03-14 17:43:30 +02:00
kaniini	59333f2d56	Merge branch 'admin-api-account-view-namespace' into 'develop' MastodonAPI.Admin.AccountView → AdminAPI.AccountView See merge request pleroma/pleroma!930	2019-03-14 02:01:10 +00:00
kaniini	86871c8a04	Merge branch 'feature/add-local-to-users-admin-api' into 'develop' Add "local" & "tags" to users admin API See merge request pleroma/pleroma!932	2019-03-14 02:00:47 +00:00
Maxim Filippov	f3964f4024	Ensure empty array is returned for tags	2019-03-14 03:17:09 +03:00
Maxim Filippov	257d8e78e5	Add tags	2019-03-14 01:52:24 +03:00
kaniini	4e72762322	Merge branch 'mastofe-content-types' into 'develop' Set content types settings on mastofe endpoint. See merge request pleroma/pleroma!894	2019-03-13 22:04:23 +00:00
eugenijm	e416c344dd	Unify unfollow, accept and reject follow requests using CommonAPI	2019-03-13 20:28:36 +03:00
Maxim Filippov	490d9cf7b1	Add "local" to users admin API	2019-03-13 16:04:44 +03:00
Haelwenn (lanodan) Monnier	cc0f2f8ba3	MastodonAPI.Admin.AccountView → AdminAPI.AccountView	2019-03-13 12:17:57 +01:00
Haelwenn (lanodan) Monnier	d43b1c0b5d	Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	4b73ca638e	[Credo][CI] Add readability as it’s fixed	2019-03-13 04:26:56 +01: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	8cd3eada7d	[Credo] write large numbers with underscore separation	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	c3d41b2b6e	[Credo] make all variables use snake_case	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	fb82f6fc7c	[Credo] Remove parentesis on argument-less functions	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	4c440f12c3	[Credo] Fix the consistency	2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier	6c8743d0c0	[Credo] Fix the warnings	2019-03-13 04:17:30 +01:00
Maxim Filippov	25eb6cf1cb	Add "roles" to users admin API	2019-03-12 22:15:28 +03:00
kaniini	c231ed610a	Merge branch 'masto-api-followers-following' into 'develop' MastoAPI followers/following endpoints See merge request pleroma/pleroma!924	2019-03-12 16:27:47 +00:00
link0ff	9338f061a3	Support LDAP method start_tls	2019-03-12 18:20:02 +02:00
eugenijm	984b5f8adf	MastoAPI followers/following endpoints	2019-03-12 16:01:24 +03:00
kaniini	4aa285e6ce	Merge branch 'add-screenname-extension-to-masto-api' into 'develop' MastoAPI Accounts: Add fetching by nickname. See merge request pleroma/pleroma!922	2019-03-11 21:43:46 +00:00
lain	07277879e5	Linting.	2019-03-11 19:32:21 +01:00
lain	600f428db4	WebPush: Add activity id to the push messages. Makes it easier to relate the push to a given status.	2019-03-11 19:23:21 +01:00
Ivan Tashkinov	63ab61ed3f	Sign in via Twitter (WIP).	2019-03-11 20:37:26 +03:00
lain	3474066f6d	MastoAPI Accounts: Add fetching by nickname. This is to make it easier for the frontends to handle domain.com/users/nickname urls.	2019-03-11 15:18:32 +01:00
lambda	2c8deecdd2	Merge branch 'add-local-field-to-status' into 'develop' MastoAPI StatusView: Add locality indicator. See merge request pleroma/pleroma!920	2019-03-11 13:26:12 +00:00
lambda	d9ae2d00a1	Merge branch 'feat/style-oauth-login-page' into 'develop' Style again the OAuth login page to fit pleroma more See merge request pleroma/pleroma!921	2019-03-11 13:19:24 +00:00
Shpuld Shpuldson	50edead11c	Remove chromium input hilight that clashes with our own	2019-03-11 15:10:42 +02:00
Shpuld Shpuldson	8ddbedcd9a	Style again the login page to fit pleroma more	2019-03-11 14:57:04 +02:00
lain	4811eefa6e	MastoAPI StatusView: Add locality indicator.	2019-03-11 13:48:27 +01:00
eugenijm	6038c8a753	Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec	2019-03-11 09:02:03 +03:00
William Pitcock	19afd9f81f	http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout	2019-03-08 22:56:16 +00:00
kaniini	735f40047a	Merge branch 'delete-status' into 'develop' Allow an admin to delete a user status #721 (MastoAPI) See merge request pleroma/pleroma!914	2019-03-08 22:47:41 +00:00
kaniini	130fc9eae6	Merge branch 'fetch-posts-on-first-federation' into 'develop' Fetch user's outbox posts on first federation with that user Closes #131 See merge request pleroma/pleroma!907	2019-03-08 22:33:31 +00:00
eugenijm	2827dfea50	Allow an admin to delete a user status	2019-03-08 20:21:56 +03:00
Ekaterina Vaartis	5021b7836f	Fetch user's outbox posts on first federation with that user	2019-03-08 16:27:56 +03:00
William Pitcock	e53a9fd15e	MRF: anti followbot: gracefully handle accounts without a display name	2019-03-07 12:13:48 +00:00
rinpatch	992145e64c	Merge branch 'bugfix/delete-activity-audience' into 'develop' expand the audience of delete activities to all recipients of the deleted object Closes #682 See merge request pleroma/pleroma!891	2019-03-07 11:31:08 +00:00
Karen Konou	c2faae70df	Adjust delete activity audience to match the deleted object	2019-03-07 12:26:03 +01:00
Karen Konou	6a69ece437	Revert existing object check	2019-03-07 11:53:15 +01:00
eugenijm	7342b5a45f	Preserve parameters in link headers (Mastodon API)	2019-03-07 09:12:16 +03:00
kaniini	0fe715f3ba	Merge branch 'chore/merge-search-into-list-users' into 'develop' Merge search endpoint into /users See merge request pleroma/pleroma!898	2019-03-06 22:27:42 +00:00
kaniini	07f8c79a69	Merge branch 'bugfix/rel-me_list' into 'develop' Web.RelMe: Fix having other values in rel attr See merge request pleroma/pleroma!901	2019-03-06 13:20:51 +00:00
Maksim	bc7570c282	[#647 ] tests for web push	2019-03-06 13:20:12 +00:00
Karen Konou	28d5b40d0a	Add handling of objects not in database	2019-03-05 23:15:22 +01:00
rinpatch	bcd8ef65e0	Merge branch 'add-admin-to-node-info' into 'develop' Include admins in nodeinfo Closes #689 See merge request pleroma/pleroma!899	2019-03-05 07:05:44 +00:00
Haelwenn (lanodan) Monnier	788a354ce0	Web.RelMe: Fix having other values in rel attr One example of this is Github which puts a rel="nofollow me" on the profile link.	2019-03-05 02:13:22 +01:00
eugenijm	d1de0a30cc	Include admins in nodeinfo	2019-03-05 03:17:24 +03:00
Maxim Filippov	2d30fc279f	Typo	2019-03-05 02:11:15 +03:00
William Pitcock	b7aa1ea9e6	rich media: helpers: rework validate_page_url()	2019-03-04 18:39:13 +00:00
William Pitcock	9f3cb38012	helpers: use AutoLinker to validate URIs as well as the other tests	2019-03-04 18:31:49 +00:00
William Pitcock	d38d537bee	rich media: don't crawl bogus URIs	2019-03-04 18:31:49 +00:00
kaniini	d45dbdce5a	Merge branch 'feature/add-status-text-to-notifications' into 'develop' Add status text to notifications (mentions and reposts) Closes #696 See merge request pleroma/pleroma!897	2019-03-04 18:29:13 +00:00
Maxim Filippov	f620199836	Merge search endpoint into /users	2019-03-04 21:26:32 +03:00
Maxim Filippov	0245ce842f	Remove unused code	2019-03-04 20:49:20 +03:00
Maxim Filippov	cc7b35e097	Add status text to notifications (mentions and reposts)	2019-03-04 20:47:34 +03:00
kaniini	ca5d894e68	Merge branch 'fix/like-adressing' into 'develop' Stop adresssing like activities to actor's follower collection on non-public posts See merge request pleroma/pleroma!896	2019-03-04 15:59:57 +00:00
rinpatch	33c614bce0	Stop adresssing like activities to actor's follower collection on non-public posts	2019-03-04 18:09:58 +03:00
Egor Kislitsyn	22ac2288be	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-03-04 20:48:43 +07:00
kaniini	10248d86a2	Merge branch 'unify-follow' into 'develop' Unify follow code with CommonAPI Closes #690 See merge request pleroma/pleroma!889	2019-03-04 13:25:32 +00:00
Egor Kislitsyn	eb84de0143	allow users to disable their own account	2019-03-04 19:55:11 +07:00
KokaKiwi	bf43f055dd	Set content types settings on mastofe endpoint.	2019-03-04 12:00:02 +01:00
Karen Konou	1445dc25d4	fix format	2019-03-04 11:18:45 +01:00
Karen Konou	aab86698a5	Expand "to" of delete activities	2019-03-04 11:18:45 +01:00
eugenijm	86e4b48a5e	Fix DM visibility for blocking users	2019-03-04 06:24:27 +03:00
eugenijm	594694607c	Unify Mastodon and Twitter follow implementations using CommonAPI	2019-03-04 01:00:37 +03:00
kaniini	dd5865535e	Merge branch 'muting' into 'develop' Don't stream muted accounts See merge request pleroma/pleroma!888	2019-03-03 21:10:10 +00:00
William Pearson	818a7894da	Don't stream muted accounts	2019-03-03 20:54:53 +00:00
link0ff	88a672fe88	Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well	2019-03-03 21:20:36 +02:00
link0ff	19e2b85247	Merge remote-tracking branch 'upstream/develop' into feature/openldap-support	2019-03-03 18:29:37 +02:00
kaniini	ace4231628	Merge branch 'features/bio_rel_me' into 'develop' Add rel=me to the User bio Closes #423 See merge request pleroma/pleroma!813	2019-03-03 16:00:49 +00:00
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
kaniini	c93479c6f5	Merge branch 'count-only-public-statuses' into 'develop' Increment user note count only on public activities #703 See merge request pleroma/pleroma!884	2019-03-03 15:49:19 +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
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
eugenijm	c46950d3b1	Increment user note count only on public activities	2019-03-03 14:08:43 +03:00
Maxim Filippov	2ec8cf5665	Add pagination to search	2019-03-02 17:21:30 +03:00
rinpatch	f38c316e6e	Merge branch 'bugfix/oauth-scopes-join' into 'develop' Bugfix: OAuth scopes formatting Closes #702 See merge request pleroma/pleroma!881	2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier	8e6f7fdb86	RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil	2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier	9b83236fb0	Pleroma.Web.RelMe: fixups	2019-03-02 06:32:03 +01:00
Haelwenn (lanodan) Monnier	56d4e39012	Pleroma.User: Add rel=me to URLs where it linkbacks to the profile	2019-03-02 05:36:48 +01:00
Haelwenn (lanodan) Monnier	b6a001a34c	Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response	2019-03-02 04:04:16 +01:00
Maxim Filippov	f635b675b2	Refactor a little bit	2019-03-01 21:17:23 +03:00
Maxim Filippov	f1a4c3163b	Show current user in users list as well	2019-03-01 20:23:03 +03:00
Maxim Filippov	5b08b470f6	Add "local" params to users search	2019-03-01 20:13:02 +03:00
William Pitcock	689b0730f8	activitypub: fix date header format HTTP date header specification says that days must always be two-digit. Accordingly, change the format string used to ensure days are always represented as two-digit (e.g. 01).	2019-03-01 12:22:45 +00:00
lambda	2f00814475	Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop' Bugfix #236 Prefer user look-up by nickname See merge request pleroma/pleroma!860	2019-03-01 09:48:24 +00:00
rinpatch	1341ee650e	[#675 ] Do not show DMs in mentions timeline	2019-03-01 09:37:29 +03:00
William Pitcock	28b4093233	mastodon websocket: return errors using ok, not stop	2019-02-28 16:23:55 +00:00
William Pitcock	388a3f4ca2	mastodon websocket: bring back infinity timeout	2019-02-28 16:23:24 +00:00
Maxim Filippov	46f29b9da1	Add search users endpoint	2019-02-28 19:04:47 +03:00
William Pitcock	f1d37a5e23	mastodon websocket: use pattern match to get query data, robustly handle errors	2019-02-28 16:02:48 +00:00
William Pitcock	bc53dff5b6	mastodon api: websocket: update code for cowboy 2.x	2019-02-28 15:44:12 +00:00
Maxim Filippov	72b7a0797e	Use Mastodon API views in Admin API	2019-02-28 17:43:09 +03:00
href	a47cc5a2cf	Merge branch 'customizable_auth' into 'develop' Authenticator tweaks See merge request pleroma/pleroma!875	2019-02-28 11:18:01 +00:00
Ivan Tashkinov	3281a3f074	Renamed DatabaseAuthenticator to Authenticator.	2019-02-28 14:12:41 +03:00
Ivan Tashkinov	4e77f68414	Added `auth_template/0` to DatabaseAuthenticator.	2019-02-28 13:58:58 +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
href	90a24fbf95	Merge branch 'customizable_auth' into 'develop' Auth customization support See merge request pleroma/pleroma!852	2019-02-28 10:12:26 +00:00
kaniini	3c849d0438	Merge branch 'deactivated-in-user-view' into 'develop' Add activation status to the regular user view See merge request pleroma/pleroma!874	2019-02-28 10:08:31 +00:00
Ivan Tashkinov	b6f915313f	Made auth customization be runtime-configurable.	2019-02-28 13:00:54 +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
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
lain	c1ae495878	Add user muted status info to MastodonAPI.	2019-02-27 16:46:47 +01:00
lain	c4235f96bd	Add `with_muted` param.	2019-02-27 16:37:42 +01:00
William Pitcock	1536640962	mastodon api: embed relationship card under account card for Pleroma FE convenience	2019-02-27 13:01:10 +00: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
Maxim Filippov	90d0d055fc	Add more admin actions	2019-02-27 00:13:38 +03:00
Ivan Tashkinov	e98d34e5fb	Added missing copyright headers.	2019-02-26 16:26:54 +03:00
Ivan Tashkinov	fd46edb473	Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth	2019-02-26 15:29:43 +03:00
Ivan Tashkinov	e82b70eb53	Database authenticator behaviour / Pleroma implementation refactoring.	2019-02-26 15:27:01 +03:00
William Pitcock	fc9d895ebc	twitter card: remove IO.inspect() spam	2019-02-24 18:56:44 +00:00
11backslashes	efa506b874	delegate user retrieval to the User module	2019-02-24 13:23:47 -05:00
link0ff	e278d47023	OpenLDAP support	2019-02-22 15:03:43 +02:00
lain	9e0686efa6	Move visibility into own module.	2019-02-22 13:29:52 +01:00
lain	62296f5a25	Fix private post card handling.	2019-02-22 12:02:51 +01:00
Ivan Tashkinov	afddce45b3	Minor setting name adjustment (:app_template -> :app_layout).	2019-02-22 11:10:17 +03:00
kaniini	5a4e2905fe	Merge branch 'fix/twittercards' into 'develop' Fix Twitter Cards See merge request pleroma/pleroma!815	2019-02-22 04:38:14 +00:00
KZ	7c722c08f5	Fix: Fixing an outbox related bug when local user activity is empty	2019-02-22 04:37:48 +00:00
Ivan Tashkinov	1097ce6d9f	Auth customization support. OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.	2019-02-21 18:55:19 +03:00
lambda	2813f28b6f	Merge branch 'bugfix/httpsig-sign-date' into 'develop' activitypub: sign date header Closes #649 and #364 See merge request pleroma/pleroma!847	2019-02-21 08:20:06 +00:00
William Pitcock	f8a72f2997	activitypub: sign http date header	2019-02-21 00:23:17 +00:00
William Pitcock	1803d9a022	fix fetching AP objects with application/json	2019-02-20 20:45:40 +00:00
William Pitcock	22e2ed235d	logging: only return ISE reasons in API responses when in dev or test mode	2019-02-20 17:36:47 +00:00
William Pitcock	8b08096436	logging: improve visibility into ISE errors	2019-02-20 17:14:18 +00:00
Egor	bff9eb5ef7	Reports	2019-02-20 16:51:25 +00:00
lain	59c27f29c8	Add some nicer urls in status view.	2019-02-20 17:36:16 +01:00
Ivan Tashkinov	b574d97c2e	[#468 ] Added support for `push` OAuth scope (Mastodon 2.4+).	2019-02-20 17:27:41 +03:00
Ivan Tashkinov	6fe7acd58e	[#468 ] Merged `upstream/develop`.	2019-02-20 16:48:59 +03:00
lambda	11b3c10c54	Merge branch 'muting' into 'develop' Implement muting, add it to the whole mastodon API See merge request pleroma/pleroma!319	2019-02-20 13:19:37 +00:00
Ivan Tashkinov	3ad91ec3c1	[#468 ] Adjusted scope restriction for MastodonAPIController#index.	2019-02-20 14:05:02 +03:00
Ekaterina Vaartis	5a46d37af9	Update the mute implementation to the current codebase Make it part of the info thing (and do a migration to ensure it's there)	2019-02-19 23:09:16 +03:00
Ekaterina Vaartis	da64ea4a55	Implement mastodon mutes endpoint Aparently i forgot to add it, it gets a list of muted users	2019-02-19 21:49:55 +03:00
Ekaterina Vaartis	f41f017bbc	Implement muting, add it to the mastodon API	2019-02-19 21:49:55 +03:00
href	f4bfc628ca	Player: allow styles on CSP, loop videos	2019-02-19 18:56:57 +01:00
href	aa9af1d639	CSP: Allow iframes on embed player	2019-02-19 18:19:13 +01:00
Mark Felder	2d21ea1a0e	Merge branch 'develop' into fix/twittercards	2019-02-19 16:58:28 +00:00
href	10a11f083c	Embed player suitable for Twitter Cards	2019-02-19 17:47:48 +01:00
eugenijm	25b9e7a8c3	Added admin API for changing user activation status	2019-02-19 19:37:02 +03:00
Ivan Tashkinov	c0ecbf6669	[#468 ] Merged `upstream/develop`.	2019-02-19 19:10:55 +03:00
lambda	f25a3f4f78	Merge branch 'fix/check-follower-collection-in-is_private' into 'develop' properly check for follower address in is_private? See merge request pleroma/pleroma!841	2019-02-19 14:08:19 +00:00
rinpatch	96dcacade1	properly check for follower address in is_private?	2019-02-19 13:23:13 +03:00
kaniini	833161b5d2	Merge branch 'feature/jobs' into 'develop' Job Queue See merge request pleroma/pleroma!732	2019-02-18 19:43:06 +00:00
kaniini	a39a094cda	Merge branch 'patch-image-description' into 'develop' Patch to support image descriptions for pleroma-fe See merge request pleroma/pleroma!626	2019-02-18 04:11:46 +00: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	c23bd05737	Merge branch 'features/flavour-switching' into 'develop' [MastoAPI] Add switching of frontend flavours See merge request pleroma/pleroma!807	2019-02-18 04:01:51 +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
kaniini	3f38a05571	Merge branch 'csv-export' into 'develop' Add option to return all friends in twitter api. Closes #602 See merge request pleroma/pleroma!833	2019-02-18 03:59:46 +00:00
Maxim Filippov	94708d6370	Render only "id", "valid_until" and "app_name" in TokenView	2019-02-17 23:57:35 +03:00
lambda	f26582aae9	Merge branch 'mastoapi-stop-capping-attachments' into 'develop' Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon See merge request pleroma/pleroma!834	2019-02-17 17:37:48 +00:00
Ivan Tashkinov	d3fe2c8ec6	[#468 ] Formatting fix.	2019-02-17 14:07:35 +03:00
Ivan Tashkinov	bc4f77b10b	[#468 ] Merged `upstream/develop`, resolved conflicts.	2019-02-17 14:07:04 +03:00
Ivan Tashkinov	dcf24a3233	[#468 ] Refactored OAuth scopes' defaults & missing selection handling.	2019-02-17 13:49:14 +03:00
rinpatch	8f98d970c1	Fix recipient count in hellthread policy	2019-02-17 13:46:40 +03:00
Haelwenn (lanodan) Monnier	4df455f69b	[MastoAPI] Add switching of frontend flavours	2019-02-16 19:50:13 +01:00
rinpatch	96c725328b	Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon	2019-02-16 20:38:25 +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
Ivan Tashkinov	2a4a4f3342	[#468 ] Defined OAuth restrictions for all applicable routes. Improved missing "scopes" param handling. Allowed "any of" / "all of" mode specification in OAuthScopesPlug. Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.	2019-02-15 19:54:37 +03:00
lambda	1ce1b7b58d	Merge branch 'bugfix/oauth-token-padding' into 'develop' oauth: never use base64 padding when returning tokens to applications See merge request pleroma/pleroma!825	2019-02-15 14:58:13 +00:00
rinpatch	921571c19b	Merge branch 'hellthread-filter-fix' into 'develop' Hellthread filter fix Closes #634 See merge request pleroma/pleroma!831	2019-02-15 13:18:35 +00:00
Karen Konou	c2e0a0c8d4	Readd threshold is not 0 check, optmization?	2019-02-15 14:05:20 +01:00
Karen Konou	dca6bee2f7	Rename test, add check for follower collection when delisting	2019-02-15 13:43:14 +01:00
rinpatch	b63a5e309d	Merge branch 'bugfix/actor-containment' into 'develop' activitypub: correctly handle bare URIs in user lookup Closes #645 See merge request pleroma/pleroma!829	2019-02-15 12:27:03 +00:00
Karen Konou	d943c90249	Add tests, change default config values, fix a bug	2019-02-15 12:47:50 +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
lambda	ea2698beb7	Merge branch 'bugfix/activitypub-reserialization' into 'develop' activitypub transmogrifier: fix reserialization edge cases See merge request pleroma/pleroma!826	2019-02-14 19:54:16 +00:00
William Pitcock	56862f4ce1	activitypub: clean up logging statements a little	2019-02-14 19:42:33 +00:00
Wim Vanderbauwhede	04b1c13554	Merge remote-tracking branch 'upstream/develop' into patch-image-description	2019-02-14 16:41:40 +00:00
Ivan Tashkinov	027adbc9e5	[#468 ] Refactored OAuth scopes parsing / defaults handling.	2019-02-14 17:03:19 +03:00
Egor Kislitsyn	3f32d7b937	Fix queue name	2019-02-14 17:02:47 +07:00
Egor Kislitsyn	907306174b	fix S3 links encoding in Mediaproxy	2019-02-14 15:55:21 +07:00
William Pitcock	72ba5b4ab7	activitypub: user view: formatting	2019-02-14 03:13:07 +00:00
William Pitcock	5307c211b8	activitypub: user view: report totalItems=0 for follows/followers when hidden	2019-02-14 03:10:00 +00:00
William Pitcock	6542b86292	activitypub: user view: remove totalItems from user outbox (this is based on a counter in User.Info, but the counter is not reliable.)	2019-02-14 03:02:45 +00:00
William Pitcock	ee2fa1a314	activitypub: user view: remove totalInbox from user inbox view It is not really feasible to quickly calculate the totalItems value and it shouldn't be trusted anyway.	2019-02-14 03:01:39 +00:00
kaniini	bc9e5e6b65	Merge branch 'feature/activitypub-oauth-endpoints' into 'develop' ActivityPub C2S oauth endpoints See merge request pleroma/pleroma!821	2019-02-14 02:50:06 +00:00
William Pitcock	64620d8980	activitypub: user view: do not expose oAuth endpoints for instance users	2019-02-14 02:41:21 +00:00
William Pitcock	e9ef4b8da6	oauth: never use base64 padding when returning tokens to applications The normal Base64 alphabet uses the equals sign (=) as a padding character. Since Base64 strings are self-synchronizing, padding characters are unnecessary, so don't generate them in the first place.	2019-02-14 01:10:04 +00:00
William Pitcock	e05bf2940f	activitypub: transmogrifier: correctly handle nil inReplyTo value	2019-02-14 00:35:54 +00:00
William Pitcock	94cbbb0e3a	activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects	2019-02-14 00:35:53 +00:00
Mark Felder	f62c1d6266	Improve login error for OAuth flow	2019-02-13 22:33:22 +00:00
Ivan Tashkinov	063baca5e4	[#468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.	2019-02-14 00:29:29 +03:00
William Pitcock	9bd6ed975e	activitypub: user view: use route helpers instead of hardcoded URIs	2019-02-13 19:34:43 +00:00
William Pitcock	29e946ace4	activitypub: user view: add oauthRegistrationEndpoint to user profiles	2019-02-13 19:34:43 +00:00
William Pitcock	db8abd958d	activitypub: user view: fix up endpoints rendering	2019-02-13 19:34:43 +00:00
William Pitcock	90facd3598	user view: add AP C2S oauth endpoints to local user profiles	2019-02-13 19:34:43 +00:00
Karen Konou	bef9b9cb66	refactored code	2019-02-13 16:23:09 +01:00
Karen Konou	adcdd21f16	Merge branch 'develop' into hellthread-filter-fix	2019-02-13 16:22:14 +01:00
Maxim Filippov	760fec4cb8	Update token.ex	2019-02-13 12:59:56 +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
Karen Konou	1d727cd069	added checks for public url and follower collections	2019-02-13 00:01:34 +01:00
Mark Felder	c984e8272a	Formatting	2019-02-12 00:37:22 +00:00
Mark Felder	4956ab5ea3	Fix compile	2019-02-12 00:25:12 +00:00
Mark Felder	ac7ef0999d	WIP: Fix Twitter Cards Twitter cards were not passing any useful metadata. A few things were being handled on Twitter's end by trying to match OpenGraph tags with their own, but it wasn't working at all for media. This is an attempt to fix that. Common functions have been pulled out of opengraph and put into utils. Twitter's functionality was entirely replaced with a direct copy of Opengraph's and then modified as needed. Profiles are now represented as Summary Cards Posts with images are now represented as Summart with Large Image Cards Posts with video and audio attachments are represented as Player Cards. This now passes the Twitter Card Validator. Validator and Docs are below https://cards-dev.twitter.com/validator https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards	2019-02-11 23:59:04 +00:00
rinpatch	379d04692c	Filter summary in keywordpolicy	2019-02-11 21:35:40 +03:00
rinpatch	39383a6b79	Merge branch 'feature/thread-muting' into 'develop' Feature/thread muting See merge request pleroma/pleroma!796	2019-02-11 15:02:14 +00:00
lambda	044616292b	Merge branch 'feature/rich-media-limits' into 'develop' rich media: tighten fetching timeouts and size limits See merge request pleroma/pleroma!809	2019-02-11 12:33:58 +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
lambda	d53e36bf1e	Revert "Merge branch 'object-creation' into 'develop'" This reverts merge request !802	2019-02-11 08:07:39 +00:00
Egor Kislitsyn	305d219413	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs # Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex	2019-02-11 13:54:21 +07:00
William Pitcock	45e57dd187	rich media: tighten fetching timeouts and size limits	2019-02-10 21:54:08 +00:00
kaniini	6c8d15da11	Merge branch 'fix/credo-issues' into 'develop' Fix credo issues See merge request pleroma/pleroma!786	2019-02-10 20:54:21 +00:00
Karen Konou	cc21fc5f53	refactor, status view updating, error handling	2019-02-10 10:42:30 +01:00
lain	f8388be9c6	Do object insertion through Cachex So we don't flood our postgres logs with errors. Should also make things slightly faster.	2019-02-09 22:01:08 +01:00
Karen Konou	6a150de3bd	Add unique index and unique constraint check, uniqueness test fails	2019-02-09 20:52:11 +01:00
Karen Konou	a0d732ec55	it works!!	2019-02-09 17:47:57 +01:00
Haelwenn (lanodan) Monnier	d924dc73ba	de-group import/s	2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier	6a6a5b3251	de-group alias/es	2019-02-09 16:31:17 +01:00
Ivan Tashkinov	a337bd114c	[#468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.	2019-02-09 17:32:33 +03:00
Ivan Tashkinov	4ad843fb9d	[#468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.	2019-02-09 17:09:08 +03:00
Haelwenn (lanodan) Monnier	2272934a5e	Stash	2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier	d2e4eb7c74	Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it	2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier	473095faf2	Web.Federator: Fix unused variable	2019-02-09 14:59:20 +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
Haelwenn (lanodan) Monnier	8bcfac93a8	Make credo happy	2019-02-09 14:59:20 +01:00
lambda	1eecbc1cd1	Merge branch 'feature/keyword-policy' into 'develop' Add keyword policy See merge request pleroma/pleroma!794	2019-02-09 11:38:37 +00:00
Karen Konou	7e47a810a2	help i am not good with git	2019-02-08 13:22:29 +01:00
Karen Konou	5c5b228f21	Added thread unmuting (still a bit buggy maybe)	2019-02-08 13:20:40 +01:00
Karen Konou	a44e532fb1	Added thread unmuting (still a bit buggy maybe)	2019-02-08 13:17:11 +01:00
rinpatch	7356659273	wow	2019-02-08 15:12:13 +03:00
Karen Konou	98ec578f4d	Merge branch 'develop' into feature/thread-muting	2019-02-08 12:44:02 +01:00
rinpatch	f88dec8b33	What idiot did that? (me)	2019-02-08 13:16:50 +03:00
rinpatch	6c21f5aa16	Merge branch 'develop' into feature/keyword-policy	2019-02-08 13:12:33 +03:00
rinpatch	8a0b755c19	rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy	2019-02-08 13:12:09 +03:00
rinpatch	2174f6eb4f	Add default config for keyword policy	2019-02-08 12:48:39 +03:00
rinpatch	46aa8c18a2	Add keyword policy	2019-02-08 12:38:24 +03:00
Karen Konou	c43f414a79	Somehow fixed the repo insert [skip-ci]	2019-02-07 23:44:49 +01:00
Karen Konou	7e3ec93ed0	made a silly oopsie	2019-02-07 22:59:53 +01:00
Karen Konou	77448de492	ugghhhh	2019-02-07 22:25:07 +01:00
Ivan Tashkinov	2c68cf7e9e	OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix. (`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris, and if that happened before /web/login is accessed for the first time then Pleroma used this externally created record with arbitrary redirect_uris and client_secret known by creator).	2019-02-07 22:14:06 +03:00
Karen Konou	f4ff4ffba2	Migration and some boilerplate stuff	2019-02-07 17:36:14 +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
Haelwenn	1220a17146	Merge branch 'bugfix/rich-media-card' into 'develop' rich media cards: bugfixes and regression tests See merge request pleroma/pleroma!785	2019-02-06 18:39:13 +00:00
kaniini	18e783bcb2	Merge branch 'add-admin-and-moderator-fields' into 'develop' Add admin and moderator badges to user view and make their visibility configurable See merge request pleroma/pleroma!767	2019-02-06 18:19:47 +00:00
William Pitcock	65a4b9fbea	mastodon api: rich media: don't clobber %URI struct with a string	2019-02-06 18:02:15 +00:00
rinpatch	f7aedbcc55	Merge branch 'fix/activitypub-user-view-badmap' into 'develop' Fix if clause in activity_pub user_view See merge request pleroma/pleroma!783	2019-02-06 17:47:58 +00:00
href	f753043ce0	Fix if clause in activity_pub user_view	2019-02-06 18:42:19 +01:00
Egor Kislitsyn	6f05f448f8	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-06 11:33:00 +07: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	d83dbd9070	rich media: parser: reject any data which cannot be explicitly encoded into JSON	2019-02-05 20:50:57 +00:00
kaniini	d120aa63f0	Merge branch 'fix-dm-index' into 'develop' Massage index until it actually does the stuff we want. See merge request pleroma/pleroma!772	2019-02-05 20:27:31 +00:00
kaniini	681ba1e52f	Merge branch 'feature/ap-c2s-whoami' into 'develop' activitypub: c2s: add /api/ap/whoami endpoint for andstatus See merge request pleroma/pleroma!773	2019-02-05 20:26:31 +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
kaniini	ecdb0b7f57	Merge branch 'bugfix/rich-media-image-nil' into 'develop' mastodon api: fix rendering of cards without image URLs (closes #597) Closes #597 See merge request pleroma/pleroma!777	2019-02-05 18:53:43 +00:00
William Pitcock	1d94b67e40	mastodon api: fix rendering of cards without image URLs (closes #597 )	2019-02-05 18:30:27 +00:00
William Pitcock	e71ab5a10f	activitypub: transmogrifier: fix bare tags	2019-02-05 00:43:28 +00:00
William Pitcock	db1165f70f	activitypub: c2s: add /api/ap/whoami endpoint for andstatus	2019-02-04 22:58:29 +00:00
lain	f3c8b02d65	Massage index until it actually does the stuff we want. Also makes the index a lot smoler.	2019-02-04 23:47:29 +01:00
William Pitcock	7d110be119	activitypub: mrf: tag policy: fix force-unlisted and sandbox actions	2019-02-04 19:03:54 +00:00
William Pitcock	64a3993425	activitypub: mrf: tag policy: add support for subscription control	2019-02-04 17:48:48 +00:00
Egor Kislitsyn	14d967f515	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-05 00:38:05 +07:00
William Pitcock	ff2c28fd6d	activitypub: mrf: tag policy: refactor the filtering hook a bit	2019-02-04 17:06:37 +00:00
William Pitcock	9a69f08e86	activitypub: mrf: tag policy: add support for processing follow requests	2019-02-04 17:04:05 +00:00
William Pitcock	084bb8ccd5	activitypub: mrf: tag policy: implement force-unlisted and sandbox	2019-02-04 17:04:05 +00:00
William Pitcock	88e32a32ce	mrf: add initial MRF.TagPolicy engine	2019-02-04 17:04:05 +00:00
rinpatch	00835bf678	Merge branch 'fix/rich-media-relative-path' into 'develop' Fix rich media relative path Closes #588 See merge request pleroma/pleroma!759	2019-02-04 16:01:34 +00:00
Egor Kislitsyn	3a3a3996b7	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/federator/federator.ex	2019-02-04 20:50:28 +07:00
rinpatch	89762ad230	Merge branch 'feature/hellthread-filter-improvements' into 'develop' Improve hellthread filter Closes #584 See merge request pleroma/pleroma!766	2019-02-04 12:36:50 +00:00
Karen Konou	58262a8b8a	removed a debug thingy	2019-02-04 11:22:25 +00:00
Karen Konou	4430641349	squished a bug	2019-02-04 12:09:00 +01:00
Karen Konou	3cf046babb	actually commited the changes	2019-02-04 10:23:43 +01:00
Karen Konou	63a4f4b7be	fixed Map,put arguments, updated nomenclature	2019-02-04 10:23:07 +01:00
Karen Konou	583c4e0f17	more tweaks, fixed silly mistakes...	2019-02-03 23:56:20 +01:00
Karen Konou	e10cda7541	implemented tweaks	2019-02-03 22:46:06 +01:00
Karen Konou	531507a635	fixed things	2019-02-03 20:45:32 +01:00
Karen Konou	10130fa7d6	made toggleable, added docs	2019-02-03 20:27:28 +01:00
Karen Konou	0ef0ae35ab	added optional delist feature	2019-02-03 20:12:23 +01:00
Maxim Filippov	16ce129e38	Split hide_network into hide_followers & hide_followings (fixed)	2019-02-03 21:55:04 +03:00
lambda	69a38644bc	Merge branch '589-fix-cache' into 'develop' Resolve "Update object cache on favs/boosts" Closes #589 See merge request pleroma/pleroma!764	2019-02-03 18:19:40 +00:00
lain	505a084058	Still do caching in tests.	2019-02-03 18:28:14 +01:00
Ivan Tashkinov	3913b0196e	[#582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified. Added tests.	2019-02-03 13:28:13 +03:00
Ivan Tashkinov	b40b4bc4e5	[#582 ] Optimized federation retirement by reducing the number of SQL calls (calling `Instances.set_reachable/1` only if instance had `unreachable_since`, calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).	2019-02-03 12:41:27 +03:00
Maxim Filippov	2c59eb3cfc	Add responsive features to layout	2019-02-02 13:40:34 +03:00
rinpatch	68d461b3a9	Check if rich media uri is relative	2019-02-02 12:24:24 +03:00
rinpatch	833404f0f5	Use with instead of if in the card	2019-02-02 12:04:18 +03:00
rinpatch	e4d18f328b	merge only if page_url is an absolute path	2019-02-02 11:53:46 +03:00
rinpatch	cbadf9d333	Fix rich media relative path	2019-02-02 11:38:37 +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
href	ffbf306c9a	Merge branch 'streaming-api-url-fix' into 'develop' Fix WebSocket streaming API URL. See merge request pleroma/pleroma!756	2019-02-01 19:39:50 +00:00
eugenijm	a184811a60	Use url() instead of static_url in Endpoint.websocket_url()	2019-02-01 22:35:19 +03:00
href	7e384a2425	Merge branch 'develop' into 'develop' Use nodeinfo 2.1 See merge request pleroma/pleroma!753	2019-02-01 19:18:46 +00:00
Luna	9cac8729af	update nodeinfo version when requesting 2.1	2019-02-01 16:03:23 -03:00
eugenijm	d747bd9870	Use String.replace_leading instead of String.replace for getting websocket streaming api url. Extract the login responsible for obtaining websocket URL into the corresponding Endpoint function.	2019-02-01 21:58:43 +03:00
Luna	1cdcee89da	mix format pass	2019-02-01 14:40:43 -03:00
Luna	23b1c64a19	downcase software name in nodeinfo	2019-02-01 14:35:08 -03:00
Luna	b17ce875cf	keep compatibility with nodeinfo 2.0 splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler gives the same result, while the 2.1 handler inserts the software.repository field. requested by @href	2019-02-01 14:23:40 -03:00
Haelwenn (lanodan) Monnier	74c6119f28	MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list	2019-02-01 18:21:16 +01: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
lambda	fc7644798d	Merge branch 'serve-sw-pleroma.js' into 'develop' Serve sw-pleroma.js properly See merge request pleroma/pleroma!754	2019-02-01 14:24:07 +00:00
href	fa5ec765d9	Serve sw-pleroma.js properly	2019-02-01 11:34:41 +01:00
lain	01d483f9c7	Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle	2019-02-01 10:21:17 +01:00
href	b3b0855456	Merge branch '534_federation_targets_reachability' into 'develop' [#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703	2019-02-01 09:14:35 +00:00
Luna	b0c4c082c4	mix format pass	2019-02-01 04:02:40 -03:00
Luna	c05928dbda	use nodeinfo 2.1, add repository field that is the only change from nodeinfo 2.0 to 2.1 also this makes the nodeinfo tests use 2.1.json instead of 2.0.json	2019-02-01 03:55:10 -03:00
lain	b19b4f8537	Remove default value for rich media. Setting it to true will actually override a 'false' set before.	2019-01-31 20:02:08 +01:00
lambda	44913c1019	Merge branch 'bugfix/rich-media-non-unicode' into 'develop' rich media non-unicode bugfix See merge request pleroma/pleroma!749	2019-01-31 16:54:48 +00:00
William Pitcock	46dba03098	rich media: parser: only try to validate strings, not numbers (OEmbed)	2019-01-31 16:19:31 +00:00
William Pitcock	dafb6f0b5e	rich media: parser: reject OGP fields we cannot safely process	2019-01-31 16:03:56 +00:00
rinpatch	7057891db6	Make rich media support toggleable	2019-01-31 18:18:20 +03:00
Haelwenn	00d4333373	Merge branch 'features/glitch-soc-frontend' into 'develop' Features/glitch soc frontend See merge request pleroma/pleroma!192	2019-01-31 10:16:11 +00:00
Egor Kislitsyn	d3677d2b4d	Merge remote-tracking branch 'MAIN/develop' into feature/jobs	2019-01-31 15:07:49 +07:00
href	5ea0397e2d	Fix `4aff4efa` typos	2019-01-30 21:08:41 +01:00
href	4aff4efa8d	Use multiple hackney pools * federation (ap, salmon) * media (rich media, media proxy) * upload (uploader proxy) Each "part" will stop fighting others ones -- a huge federation outbound could before make the media proxy fail to checkout a connection in time. splitted media and uploaded media for the good reason than an upload pool will have all connections to the same host (the uploader upstream). it also has a longer default retention period for connections.	2019-01-30 15:06:46 +01:00
kaniini	7a2c4f984b	Merge branch 'bugfix/fix-rejects' into 'develop' follow request fixups Closes #537 See merge request pleroma/pleroma!734	2019-01-29 14:47:36 +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
William Pitcock	57549f6043	activitypub: utils: update the state of any pending follow relationship that matches the actor and target	2019-01-29 12:21:02 +00:00
William Pitcock	cbb2b709de	activitypub: transmogrifier: fix follow request rejections	2019-01-29 11:57:46 +00:00
Ivan Tashkinov	92753b0cd9	[#534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.	2019-01-29 13:12:28 +03:00
Haelwenn	ebb3496386	Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop' Rich Media support, part 2. See merge request pleroma/pleroma!719	2019-01-29 05:11:08 +00:00
William Pitcock	61d6715714	rich media: oembed: return data in the same format as the other parsers	2019-01-28 21:13:25 +00:00
William Pitcock	ddb5545202	rich media: kill some testsuite noise	2019-01-28 20:55:33 +00:00
William Pitcock	0f11254a06	rich media: parser: add some basic sanity checks on the returned data with pattern matching	2019-01-28 20:43:21 +00:00
William Pitcock	83b7062634	rich media: parser: cache negatives	2019-01-28 20:19:07 +00:00
William Pitcock	8fb16e9f0f	rich media: parser: add copyright header	2019-01-28 20:00:01 +00:00
Maxim Filippov	50d6183893	Split hide_network into hide_followers & hide_followings	2019-01-28 21:40:08 +03:00
Egor Kislitsyn	55affbca7f	add a job queue	2019-01-28 22:17:17 +07:00
Ivan Tashkinov	d3f9e6f6fe	[#534 ] Merged `upstream/develop`.	2019-01-28 15:39:14 +03:00
Ivan Tashkinov	1d2f41642c	[#534 ] Various tweaks. Tests for Instances and Instance.	2019-01-28 15:25:06 +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
Haelwenn	de0fb88a9c	Merge branch 'safe-render-activities' into 'develop' remove unnecessary filter (re !723) See merge request pleroma/pleroma!729	2019-01-28 11:48:03 +00:00
href	df2f7b39dd	re `f83bae7c`: remove unnecessary filter	2019-01-28 12:24:14 +01:00
lain	1825118fd4	Correctly handle invalid credentials on auth login. Closes #407	2019-01-28 11:41:47 +01:00
Ivan Tashkinov	9560abea10	[#534 ] Refactoring / tweaks per MR review.	2019-01-28 11:03:52 +03:00
William Pitcock	ddc7ae2c1a	mastodon api: card: force OGP images through mediaproxy	2019-01-28 06:42:27 +00:00
William Pitcock	ebeabdcc72	rich media: helpers: clean up unused aliases	2019-01-28 06:10:25 +00:00
William Pitcock	91ef64a1ec	activitypub: prime OGP crawler cache when new messages are inserted into the database	2019-01-28 06:07:18 +00:00
William Pitcock	8e42251e06	rich media: add helpers module, use instead of MastodonAPI module	2019-01-28 06:04:54 +00:00
William Pitcock	24a103a1fe	mastodon api: formatting	2019-01-28 05:53:17 +00:00
William Pitcock	6096846f5f	API: kill /api/rich_media/parse endpoint	2019-01-28 05:53:17 +00:00
William Pitcock	07a9a891ad	twitter api: fix up activity representer	2019-01-28 05:53:17 +00:00
William Pitcock	de42646634	rich media: add try/rescue to ensure we catch parsing and fetching failures	2019-01-28 05:53:17 +00:00
William Pitcock	5d895093fd	twitter api: embed card in twitterapi posts	2019-01-28 05:53:17 +00:00
William Pitcock	5a37ddc2dc	mastodon api: embed card in status object	2019-01-28 05:53:17 +00:00
William Pitcock	132d815f1f	mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data	2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier	cda1470e02	[MastoAPI][GlitchAPI] Add bookmarks	2019-01-28 04:47:32 +01:00
Haelwenn (lanodan) Monnier	872241d7c5	/web/index template: Modify for glitch-soc	2019-01-28 04:43:36 +01:00
href	71bb90073b	/notice/:id - send the FE index even if 404 this allows to open private activities by URL when you are logged in, and to let the FE display a 404 page	2019-01-27 22:51:50 +01:00
lambda	16ab1437d6	Merge branch 'safe-render-activities' into 'develop' Views: wrap activity rendering in a rescue See merge request pleroma/pleroma!723	2019-01-27 20:10:09 +00:00
kaniini	ea12371a01	Merge branch 'discard-invalid-likes' into 'develop' Transmogrifier: fix incoming objects with invalid likes See merge request pleroma/pleroma!724	2019-01-27 19:10:15 +00:00
href	77f2137383	Transmogrifier: fix incoming objects with invalid likes	2019-01-27 19:33:21 +01:00
href	f83bae7c22	Views: wrap activity rendering in a rescue this avoids complete timeline breakage when an activity fucks up rendering.	2019-01-27 19:16:20 +01:00
kaniini	5eb81d2c72	Merge branch 'features/mastoapi-multi-hashtag' into 'develop' MastodonAPI multi-hashtag See merge request pleroma/pleroma!652	2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier	a65c188593	Web.MastodonAPI.AccountView: Add is_moderator and is_admin Closes: https://git.pleroma.social/pleroma/pleroma/issues/557	2019-01-27 10:33:22 +01:00
William Pitcock	8f2f471e94	rich media: gracefully handle fetching nil URIs	2019-01-26 16:36:17 +00:00
Haelwenn (lanodan) Monnier	de956b9e04	Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it	2019-01-26 16:46:20 +01:00
William Pitcock	1f7843b9b8	mastodon api: use OGP uri instead of page_url for deducing domain name, fix test	2019-01-26 15:24:16 +00:00
William Pitcock	86037e9c39	mastodon api: use HTML.extract_first_external_url()	2019-01-26 15:13:27 +00:00
William Pitcock	78047d57bf	mastodon api: provider_name setting is required too on the card	2019-01-26 14:47:32 +00:00
Haelwenn (lanodan) Monnier	39863236eb	Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.	2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier	3f64379b13	Web.MastodonAPI.MastodonAPIController: Add Rich-Media support	2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier	5a84def6a6	Fix the logic in multi-hashtag TLs	2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier	4ad0ad14ed	Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests	2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier	1a9bb4daa0	[Web.ActivityPub.ActivityPub]: Fix restrict_tag() Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching	2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier	f9cae0d04f	[WIP,MastoAPI] Multi-tag timelines	2019-01-26 04:45:36 +01:00
Haelwenn (lanodan) Monnier	15aa45ae8a	Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil	2019-01-26 03:50:49 +01:00
Ivan Tashkinov	060d280e64	[#534 ] Made Salmon.send_to_user calls be handled through Federator.enqueue.	2019-01-25 20:38:13 +03:00
Ivan Tashkinov	465adedb7c	[#534 ] Websub fix: made SQL use UTC time zone when comparing with `valid_until` (instead of postgresql-server default time zone).	2019-01-25 18:29:43 +03:00
rinpatch	3a5b3c5a3a	Merge remote-tracking branch 'pl/develop' into oembed_provider	2019-01-25 10:40:51 +03:00
kaniini	4c99b6d35a	Merge branch 'fix/tusky-dm' into 'develop' Add actor to recipients list Closes #390 See merge request pleroma/pleroma!683	2019-01-25 05:19:32 +00:00
kaniini	c9b418e547	Merge branch 'develop' into 'oembed_provider' # Conflicts: # lib/pleroma/activity.ex	2019-01-25 05:00:47 +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	9274cabe01	Use correct logic to determine "attentions" list	2019-01-24 23:30:43 +03:00
Ivan Tashkinov	3e9399ec0b	[#534 ] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring.	2019-01-24 19:15:23 +03:00
Ivan Tashkinov	8654a591f0	[#534 ] Updating external instances reachability on incoming federation.	2019-01-24 17:37:23 +03:00
William Pitcock	54ec6d09b0	mrf: add anti-followbot policy	2019-01-24 09:35:19 +00:00
Ivan Tashkinov	20b54366ee	[#534 ] Federation publish requests status control (enforced 2xx response code check).	2019-01-24 11:54:52 +03:00
Maxim Filippov	4333fea1dc	Send "hide_network" in user_view	2019-01-23 19:47:51 +03:00
Ivan Tashkinov	f161a92cb1	[#534 ] Initial implementation of unreachable federation targets retirement.	2019-01-23 18:37:25 +03:00
lain	2de208817c	Merge branch 'develop' into rename/pleroma_activity_consistency	2019-01-23 13:05:58 +01:00
lain	e221c681dc	New frontend configuration mechanism.	2019-01-23 12:40:57 +01:00
href	973c9eed18	Treat User.Info pinned ids as strings	2019-01-23 11:26:37 +01:00
href	cdc5e6ff5c	ActivityPub: restrict_since/restrict_max: ignore empty param	2019-01-23 11:26:35 +01:00
href	28d77e373c	Flake Ids for Users and Activities	2019-01-23 11:26:27 +01:00
href	f9a3269099	Uploader callback controller	2019-01-21 22:44:14 +01:00
lambda	8cd853ce0c	Merge branch '530_federator_user_info_overwrite_fix' into 'develop' [#530] Prevents user `info` from being overwritten because of race conditions Closes #530 See merge request pleroma/pleroma!691	2019-01-21 13:03:32 +00:00
lambda	69454c8345	Merge branch 'feature/dm-sanity' into 'develop' DM sanitization See merge request pleroma/pleroma!458	2019-01-21 12:35:10 +00:00
Ivan Tashkinov	a4d3fec8a7	[#502 ] Code comments update.	2019-01-21 14:52:41 +03:00
Ivan Tashkinov	aa480f4a8b	[#530 ] Prevents user `info` from being overwritten because of race conditions and non-partial update of embed (in WebFinger.ensure_keys_present and other places).	2019-01-21 14:16:51 +03: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
Haelwenn (lanodan) Monnier	2fdbd4d137	Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list	2019-01-21 08:00:40 +01:00
Haelwenn (lanodan) Monnier	f8ab1b7427	Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1	2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier	b82c6dc536	Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1	2019-01-21 07:49:59 +01:00
lain	cf1f35a93a	Send delete event over Mastodon streaming api Closes #116	2019-01-20 13:00:46 +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
William Pitcock	aa37313416	activitypub: short-circuit is_public?() with directMessage flag check	2019-01-20 02:33:21 +00:00
William Pitcock	7c9749f793	transmogrifier: slightly clean up fix_explicit_addressing pipeline	2019-01-20 02:27:48 +00:00
William Pitcock	420651157b	transmogrifier: don't apply heuristics against messages which have `directMessage` set true	2019-01-20 02:27:48 +00:00
William Pitcock	ddae43eb43	activitypub: add is_private?/is_direct? helpers	2019-01-20 02:27:48 +00:00
William Pitcock	9adc80afff	common api: set directMessage flag on our own posts	2019-01-20 02:27:48 +00:00
William Pitcock	75dfa1f0b0	mastodon api: get_visibility(): DMs never have a cc list.	2019-01-20 02:27:48 +00:00
William Pitcock	681f40ee5c	activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs	2019-01-20 02:27:48 +00:00
William Pitcock	8d06be35e0	activitypub: utils: add determine_explicit_mentions() and tests	2019-01-20 02:27:48 +00:00
kaniini	42612b1c8d	Merge branch 'bugfix/improve-boost-targeting' into 'develop' improve handling of non-public Announces See merge request pleroma/pleroma!681	2019-01-19 23:44:08 +00:00
rinpatch	44693fbf6e	Formating	2019-01-20 01:28:46 +03:00
rinpatch	afd83db0d7	Provide local og:url for remote activities	2019-01-19 10:58:27 +03:00
kaniini	651ce1c97b	Merge branch '491_full_mentions_in_user_bio' into 'develop' [#491] Made user bio preserve full nicknames (nick@host) Closes #491 See merge request pleroma/pleroma!676	2019-01-19 07:36:58 +00:00
Maxim Filippov	651a1d64b5	Add current user to mentioned	2019-01-19 04:25:15 +03:00
Maxim Filippov	e116e55cab	Add actor to recipients	2019-01-18 22:40:52 +03:00
rinpatch	74346a7035	Fix merge conflict	2019-01-18 18:31:25 +03:00
rinpatch	997f4a5e09	Remove custom emojis and trailing whitespaces from previews	2019-01-18 10:28:19 +03:00
rinpatch	1b1af4798a	Use object instead of activity for metadata	2019-01-18 09:32:52 +03:00
Ivan Tashkinov	65bb9b2fba	[#491 ] Made full nicknames be preserved in user links text only in Bio.	2019-01-18 09:30:16 +03:00
William Pitcock	75a9b2a851	activitypub: add a match clause for objects, not just activities	2019-01-17 23:32:16 +00:00
William Pitcock	dbc4e92509	activitypub: transmogrifier: do not clobber the addressing on relayed announcements	2019-01-17 23:21:31 +00:00
William Pitcock	33b473cc02	activitypub: allow is_public?() to work on any type of map representing an AS2 object	2019-01-17 23:21:31 +00:00
William Pitcock	8e9f1d5587	activitypub: relay: chase selective public announce changes	2019-01-17 23:21:31 +00:00
William Pitcock	2479e88815	activitypub: announce: add new public parameter	2019-01-17 23:21:31 +00:00
kaniini	ae8a5942cf	Merge branch 'bad-copy-paste' into 'develop' Fix bad link in likes collection See merge request pleroma/pleroma!679	2019-01-17 19:22:21 +00:00
sxsdv1	948fba6f76	Fix bad link in likes collection Don't copy and paste, mkay	2019-01-17 18:21:43 +01:00
rinpatch	a95d5da607	Don't show content if empty or zero width space	2019-01-17 20:18:28 +03:00
Mark Felder	849c83ed46	formatting	2019-01-17 16:10:26 +00:00
Mark Felder	6bc9a641ba	Default to disabled in the code in case the setting is absent from config.exs	2019-01-17 16:01:25 +00:00
Mark Felder	8c368d42a2	Make attachment links configurable Thanks @href!	2019-01-17 15:48:14 +00:00
rinpatch	4d5f15cd42	Introduce optional unfurling of nsfw content	2019-01-17 11:00:02 +03:00
rinpatch	0256bd2f1d	Use object url instead of a hack	2019-01-17 10:34:19 +03:00
rinpatch	fd3a558230	Apply feld's patch	2019-01-17 09:18:46 +03:00
rinpatch	5fa508cc2b	Remove @providers and call Pleroma.config on runtime	2019-01-16 18:04:41 +03:00
rinpatch	bb43f4cee9	Remove useless with in opengraph.ex	2019-01-16 18:02:46 +03:00
rinpatch	293f6a8b71	join us now and share the software~. Also tests	2019-01-16 17:15:13 +03:00
lain	943324b661	MastoAPI: Don't break on missing users.	2019-01-16 15:13:09 +01:00
rinpatch	b44995866b	Replace map with reduce to remove nils	2019-01-16 16:52:01 +03:00
rinpatch	ff01fd3c4f	Remove caching because it does not affect performance and may be even worse in some cases	2019-01-16 11:18:25 +03:00
rinpatch	bfe2a11a6b	Add config doc	2019-01-16 10:45:56 +03:00
rinpatch	a9c27e137d	Add a fallback function to handle generic params, just in case	2019-01-16 10:38:42 +03:00
rinpatch	a76793006b	Thanks you rinpatch, very cool	2019-01-16 10:35:06 +03:00
rinpatch	0039d45b5b	No need to use activity in the key	2019-01-16 10:30:47 +03:00
rinpatch	70b2bb6ede	add caching	2019-01-16 10:26:01 +03:00
rinpatch	dd1432d695	Disable previews for any activity, but create	2019-01-16 09:42:24 +03:00
rinpatch	565caff3f4	cache HTML in OGP	2019-01-16 00:07:28 +03:00
rinpatch	9aa69e12b8	Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate	2019-01-15 23:25:28 +03:00
rinpatch	2e630bea0d	Add twitter card, filter nsfw	2019-01-15 23:00:22 +03:00
rinpatch	70f140681f	Add space between name and nickname	2019-01-15 21:47:45 +03:00
rinpatch	e8eecd61b4	Formating	2019-01-15 21:20:27 +03:00
rinpatch	410fd9d774	Attach attachments	2019-01-15 21:17:56 +03:00
William Pitcock	17da432dbb	websub: improve error handling	2019-01-15 18:03:49 +00:00
rinpatch	ff6c9a5c96	Introduce get_by_id in Activity, replace newlines with spaces	2019-01-15 20:00:21 +03:00
rinpatch	850912b06b	refactor opengraph to a different module with a behaviour	2019-01-15 19:43:52 +03:00
rinpatch	8745c8c990	remove useless newlines after every tag. Make domain.com/username provide opengraph too	2019-01-15 18:34:47 +03:00
rinpatch	2858fd2da2	add a fallback function	2019-01-15 12:11:07 +03:00
rinpatch	ce15e0659e	Fix some edge cases [nervous laughter]	2019-01-15 11:56:35 +03:00
rinpatch	4656f433f9	Move metadata.ex out of ostatus	2019-01-15 11:00:17 +03:00
lambda	fd2f1258fb	Merge branch 'load-all-dms' into 'develop' Remove recent activity restriction. See merge request pleroma/pleroma!644	2019-01-14 18:49:53 +00:00
Ivan Tashkinov	dc45ec62c2	[#477 ] User search improvements: tsquery search with field weights, friends & followers boosting.	2019-01-14 20:04:45 +03:00
kaniini	de1da7b3d1	Merge branch 'feature/add-oembed-parser' into 'develop' Add OEmbed parser See merge request pleroma/pleroma!661	2019-01-14 07:28:04 +00:00
kaniini	fa0392e49c	Merge branch 'activitypub-likes' into 'develop' Activitypub c2s likes See merge request pleroma/pleroma!658	2019-01-14 07:27:05 +00:00
William Pitcock	6e5b0406b9	mrf: add no placeholder-text policy, strips pointless "." content from posts with images	2019-01-14 05:42:38 +00:00
rinpatch	e4dc3f71ae	Resolve merge conflict	2019-01-13 13:38:28 +03:00
Maxim Filippov	b8a77c5d70	Add OEmbed parser	2019-01-13 02:06:50 +02:00
sxsdv1	868034375c	Add likes to activitypub object representation Top level of the likes OrderedCollection is inlined to get immediate access to totalItems. Because the count can be returned without scanning the database for like activities the extra query is saved when the client only wants to display the total.	2019-01-12 20:24:41 +01:00
sxsdv1	581edd5a91	Add route to get object like activities	2019-01-12 20:24:38 +01:00
sxsdv1	36711e1c83	Handle client submitted activitypub like activity	2019-01-12 20:24:35 +01:00
sxsdv1	1eb7318831	Prepare all types objects before serialising Activities returned from inbox can include other types of objects like Article	2019-01-12 20:24:32 +01:00
Sadposter	9daf162461	Honour parameters on MastoAPI /favourites	2019-01-12 14:42:52 +00:00
Sadposter	144b48da95	Add link headers to MastoAPI /favourites As documented at https://docs.joinmastodon.org/api/rest/favourites/	2019-01-12 14:03:35 +00:00
Egor Kislitsyn	b594a54d0c	unpin when deleting a status	2019-01-11 12:31:31 +07:00
kaniini	e4afe1359b	Merge branch 'activitypub-dereference-activity-id' into 'develop' Support activity+json request for activity See merge request pleroma/pleroma!641	2019-01-10 18:42:36 +00:00
Maxim Filippov	1f851a0723	Add Twitter Card parser	2019-01-10 18:09:56 +00: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
Haelwenn	ab4c5f5bf7	Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop' common api: fix newlines in markdown code blocks See merge request pleroma/pleroma!651	2019-01-10 03:54:29 +00:00
William Pitcock	0bdbd4f968	common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown ok @lanodan	2019-01-10 03:45:58 +00:00
William Pitcock	2ecf81f10c	common api: fix newlines in markdown code blocks	2019-01-10 03:37:37 +00:00
kaniini	7f5efddd6e	Merge branch 'feature/pinned-posts' into 'develop' Pinned Statuses Closes #440 See merge request pleroma/pleroma!636	2019-01-10 02:39:53 +00:00
kaniini	d203b0b4d3	Merge branch 'dm-optimizations' into 'develop' Add activity visibility index. See merge request pleroma/pleroma!646	2019-01-10 02:31:29 +00:00
rinpatch	b57db828c7	Merge branch 'hotfix/ogp-cachex-fix' into 'develop' Rich media: Remove :commit since a tuple is already returned See merge request pleroma/pleroma!649	2019-01-09 18:42:00 +00:00
rinpatch	a2d7f0e0e9	Remove :commit since a tuple is already returned	2019-01-09 21:35:01 +03:00
lain	a99e156f2c	Add integer casts.	2019-01-09 18:17:23 +01:00
lain	7ac152ed38	TwitterAPI: Add follower/following pagination.	2019-01-09 18:14:32 +01:00
lambda	1881680e28	Merge branch 'scarlett/pleroma-summary-html-api' into 'develop' Scarlett/pleroma summary html api See merge request pleroma/pleroma!647	2019-01-09 16:26:38 +00:00
lain	5027f82cde	Add activity visibility index.	2019-01-09 16:45:09 +01:00
Egor Kislitsyn	44a1e69484	Add Twitter API for the pinned statuses ``` # Only return statuses that have been pinned GET /api/statuses/user_timeline.json?pinned=true # Pin POST /api/statuses/pin/:id # Unpin POST /api/statuses/unpin/:id ```	2019-01-09 19:54:19 +07:00
lain	9854978b8b	Remove recent activity restriction. This should be fine now, everything should be covered by indices.	2019-01-09 12:38:23 +01:00
Egor Kislitsyn	1b06e6fdf3	only non-reblogs, self-authored, public statuses can be pinned	2019-01-09 17:40:15 +07:00
sxsdv1	20c0dd1e24	Support activity+json request for activity	2019-01-09 09:33:30 +01:00
Egor Kislitsyn	0c750bc432	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-08 16:32:07 +07:00
Egor Kislitsyn	e679da4c34	add `pinned` property to `StatusView`	2019-01-08 15:27:02 +07:00
lain	a16b17cc61	Actually put some onformation in the error user, make it actually properly parse in conversations.	2019-01-07 20:59:30 +01:00
kaniini	74e1093732	Merge branch 'resilient-user-view' into 'develop' Make TwAPI UserView more resilient to issues. See merge request pleroma/pleroma!634	2019-01-07 17:09:52 +00:00
Egor Kislitsyn	f24087f96e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-07 20:55:32 +07:00
Egor Kislitsyn	380e9fba21	add pinned posts	2019-01-07 20:45:33 +07:00
lain	7382adf407	Make TwAPI UserView more resilient to issues. Will work for missing users and badly migrated users.	2019-01-07 12:41:31 +01:00
scarlett	36fa5e8802	Check visible_for_user when performing a search using a direct link.	2019-01-07 10:36:31 +00:00
scarlett	52493467ac	Twitter API: Add a summary_html field. The intention here is to allow proper subject copying when it contains emoji, obviously this will require minor frontend changes, though.	2019-01-06 10:19:00 +00:00
kaniini	576368237c	Merge branch 'activitypub-tombstone-fix' into 'develop' Don't crash on AP request for tombstone See merge request pleroma/pleroma!630	2019-01-05 22:29:08 +00:00
scarlett	145d6fe6e9	Merge branch 'emoji-in-summary' into 'develop' Strip HTML in and allow emoji in summaries. See merge request pleroma/pleroma!631	2019-01-05 21:52:02 +00:00
scarlett	6556be344d	Resolve some test failures.	2019-01-05 18:20:42 +00:00
scarlett	3c86d907d4	add some brakets to the emoji list.	2019-01-05 17:35:39 +00:00
scarlett	0787f0dfbe	Strip HTML in and allow emoji in summaries.	2019-01-05 17:28:47 +00:00
sxsdv1	2d7da5f437	Don't crash on AP request for tombstone Because tombstone objects has no addressing the is_public?-predicate would cause an error that propagated as a 500 error in the api	2019-01-05 11:16:05 +01:00
rinpatch	ba17518a0a	Merge branch 'feature/rich-media-cachex' into 'develop' rich media: use cachex to avoid flooding remote servers See merge request pleroma/pleroma!629	2019-01-04 23:56:42 +00:00
William Pitcock	487c00d36d	rich media: disable cachex in test mode	2019-01-04 23:53:26 +00:00
kaniini	bf5aaefbb5	Merge branch 'fix/html-cache-content-collision' into 'develop' Different caches based on the module. Remove scrubber version since it is not relevant anymore See merge request pleroma/pleroma!628	2019-01-04 23:35:56 +00:00
William Pitcock	0964c207eb	rich media: use cachex to avoid flooding remote servers	2019-01-04 23:32:01 +00:00
Rin Toshaka	846082e54f	Different caches based on the module. Remove scrubber version since it is not relevant anymore	2019-01-05 00:19:46 +01:00
kaniini	4258dd8633	Merge branch 'feature/rich-media' into 'develop' URL previews in posts Closes #402 See merge request pleroma/pleroma!617	2019-01-04 20:50:18 +00:00
kaniini	ffea81b84f	Merge branch 'activitypub-c2s-delete-activity' into 'develop' Activitypub c2s delete activity See merge request pleroma/pleroma!618	2019-01-04 20:32:10 +00:00
Wim Vanderbauwhede	ba93396649	Patch to support image descriptions in Pleroma FE	2019-01-04 16:27:46 +00:00
Wim Vanderbauwhede	4c95545d19	Patch to support image descriptions in Pleroma FE	2019-01-04 15:35:41 +00:00
Wim Vanderbauwhede	fe2dceb66d	Patch to support image descriptions in Pleroma FE	2019-01-04 15:22:02 +00:00
kaniini	d9d62a110c	Merge branch 'mr/retry-queue-remove-fold' into 'develop' rewrites List.foldl to Enum.each in RetryQueue See merge request pleroma/pleroma!621	2019-01-03 22:30:02 +00:00
rinpatch	b73a1a33de	Merge branch 'captcha' into 'develop' Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585	2019-01-03 17:04:27 +00:00
Michael Loftis	943211b035	rewrites List.foldl to Enum.each	2019-01-02 21:21:40 +00:00
Maxim Filippov	48e81d3d40	Add RichMediaController and tests	2019-01-02 17:02:50 +03:00
sxsdv1	4e1cc2bab6	Implement delete activity	2019-01-01 23:20:43 +01:00
sxsdv1	551c3d9391	Split create activity specifics from update_outbox	2019-01-01 23:20:28 +01:00

... 12 13 14 15 16 ...

3162 commits