4862 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Haelwenn (lanodan) Monnier	85b5c60694	Pleroma.Formatter: width/height to class=emoji	2019-05-03 16:25:58 +02:00
lambda	027ded0df7	Merge branch 'fix/replace-ws' into 'develop' ... Standardize construction of websocket URL See merge request pleroma/pleroma!1115	2019-05-03 11:45:04 +00:00
feld	acb04306b6	Standardize construction of websocket URL ... This follows up on the change made in d747bd98	2019-05-03 11:45:04 +00:00
lambda	497d34b825	Merge branch 'iss-849' into 'develop' ... Parse access_token from body parameters and URL parameters See merge request pleroma/pleroma!1103	2019-05-02 14:17:17 +00:00
AkiraFukushima	a53a6c9d64	Add oauth plug tests for url and body parameters	2019-05-02 22:25:21 +09:00
AkiraFukushima	dff6afc7c8	fix: Add mix deps.get before unit-testing	2019-05-02 21:04:09 +09:00
AkiraFukushima	533d8cd581	Parse access_token from body parameters and URL parameters	2019-05-02 21:04:00 +09:00
lambda	d107919b3d	Merge branch 'support/oauth' into 'develop' ... Refactored Pleroma.Web.Auth.Authenticator See merge request pleroma/pleroma!1108	2019-05-01 13:28:04 +00:00
Maksim	c854bff8f5	Refactored Pleroma.Web.Auth.Authenticator	2019-05-01 13:28:04 +00:00
rinpatch	622c804c9a	Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop' ... Remove redundant ensure_scrubbed_html See merge request pleroma/pleroma!1114	2019-05-01 11:02:08 +00:00
rinpatch	51e26f14f7	Remove redundant ensure_scrubbed_html ... It is never used as handling for fake and non-fake activities was merged into one function above it	2019-05-01 13:52:44 +03:00
lambda	a58813e7a1	Merge branch 'features/download-mastofe-build' into 'develop' ... installation/download-mastofe-build.sh: Add mastofe CI-artifacts download See merge request pleroma/pleroma!1052	2019-05-01 10:48:30 +00:00
lambda	0bcdaf378e	Merge branch 'bugfix/web-notification-special-char' into 'develop' ... fix the web push notification with special char for status created See merge request pleroma/pleroma!1092	2019-05-01 10:45:32 +00:00
lambda	297596ce48	Merge branch 'harmonize_return_types_in_user_module' into 'develop' ... Harmonize return types in user module Closes #718 See merge request pleroma/pleroma!1112	2019-05-01 10:41:00 +00:00
rinpatch	a7c9e3b242	Merge branch 'docs/fix-config.md' into 'develop' ... [docs/config.md]Fix syntax highlighting + clarify :frontend_configuration See merge request pleroma/pleroma!1110	2019-05-01 09:16:25 +00:00
rinpatch	7c5f1ef327	Merge branch 'update_auto_linker' into 'develop' ... Update `auto_linker` See merge request pleroma/pleroma!1111	2019-05-01 09:14:10 +00:00
Alex S	f11e7037c2	test fixes	2019-05-01 16:09:53 +07:00
Egor Kislitsyn	04fd7cf817	Update auto_linker	2019-05-01 15:18:12 +07:00
Alex S	bdfa3a6fa8	Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex	2019-05-01 12:29:33 +07:00
xse	2982061dfa	Fix syntax highlighting + clarify :frontend_configuration	2019-05-01 01:26:14 +02:00
Sachin Joshi	85fa2fbce4	add scrubber for html special char	2019-05-01 01:37:17 +05:45
Sachin Joshi	cd6da3606b	Merge branch 'develop' into bugfix/web-notification-special-char	2019-05-01 00:21:30 +05:45
rinpatch	77690b9d03	Merge branch 'fix/stream_out-normalize-only-creates' into 'develop' ... Do not normalize objects in stream_out unless the activity type is Create See merge request pleroma/pleroma!1109	2019-04-30 17:31:48 +00:00
rinpatch	ce4825c1dc	Do not normalize objects in stream_out unless the activity type is ... Create Saves quite a bit of time with delete activities because they would always query the db	2019-04-30 20:21:28 +03:00
rinpatch	32a4501d2d	Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop' ... Fix MigrateOldBookmarks migration crashing on deleted activities See merge request pleroma/pleroma!1106	2019-04-29 18:33:06 +00:00
rinpatch	f8f6af4cc1	Fix MigrateOldBookmarks migration crashing on deleted activities	2019-04-29 21:25:30 +03:00
rinpatch	41d78f9108	Merge branch 'fix-webpush' into 'develop' ... WebPush: Use Object.normalize, rewrite tests so they test reality. See merge request pleroma/pleroma!1105	2019-04-29 16:24:33 +00:00
lain	b0951a8849	WebPush: Use Object.normalize, rewrite tests so they test reality.	2019-04-29 18:15:30 +02:00
rinpatch	0fd176b990	Merge branch 'fix/add-default-scope-mastoapi' into 'develop' ... Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100	2019-04-29 06:45:18 +00:00
kaniini	8e266e02da	Merge branch 'fix/uploads-folder-issues' into 'develop' ... fix issues with the uploads directory See merge request pleroma/pleroma!1101	2019-04-28 23:05:50 +00:00
kaniini	292c69481b	Merge branch 'regression/rights-only-for-admin' into 'develop' ... Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102	2019-04-28 23:05:14 +00:00
rinpatch	61ca2f7a4e	Fix rights in TwitterAPI's user entity being present only for ... Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.	2019-04-28 19:42:43 +03:00
xse	31852f906e	fix issues with the uploads directory	2019-04-28 06:43:00 +02:00
kaniini	f2a4156d49	Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop' ... Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL See merge request pleroma/pleroma!1099	2019-04-28 00:21:32 +00:00
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	2019-04-27 23:55:54 +03:00
rinpatch	c3e9fcf098	Fix bookmarks depending on embeded object and move checking if the ... status is bookmarked to SQL	2019-04-27 23:06:46 +03:00
kaniini	002ea343f8	Merge branch 'feature/bbcode' into 'develop' ... BBCode support (backend) See merge request pleroma/pleroma!1097	2019-04-27 07:44:24 +00:00
kaniini	81bc274930	Merge branch 'update/pleroma-fe-20190426' into 'develop' ... update pleroma frontend See merge request pleroma/pleroma!1098	2019-04-27 07:42:01 +00:00
William Pitcock	52bdfced32	update pleroma frontend	2019-04-27 07:34:59 +00:00
William Pitcock	ef52aa0e66	tests: fix up for changed bbcode library output and verify html is properly escaped	2019-04-26 22:45:45 +00:00
William Pitcock	501af917b5	add support for bbcode	2019-04-26 22:35:02 +00:00
William Pitcock	2bd880be88	mix: add bbcode dependency	2019-04-26 22:34:59 +00:00
lambda	4de5fef1f8	Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' ... Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059	2019-04-26 11:59:47 +00:00
kaniini	48f68fd133	Merge branch 'feature/mastoapi-new-config' into 'develop' ... Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093	2019-04-26 02:41:35 +00:00
kaniini	fd45c74e6f	Merge branch 'chore/update-changelog' into 'develop' ... update Changelog See merge request pleroma/pleroma!1096	2019-04-25 23:35:13 +00:00
William Pitcock	99b0792751	update Changelog	2019-04-25 23:27:58 +00:00
kaniini	5b2791698c	Merge branch 'feature/mediaproxy-whitelist' into 'develop' ... Add mediaproxy whitelist capability Closes #837 See merge request pleroma/pleroma!1095	2019-04-25 23:23:27 +00:00
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	2019-04-25 18:11:47 -05:00
Haelwenn	8c9227c1f1	Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop' ... activitypub: transmogrifier: send reject follow if following does not succeed See merge request pleroma/pleroma!1094	2019-04-25 09:47:42 +00:00
rinpatch	dfc8425659	Move settings to Source subentity	2019-04-25 10:31:14 +03:00