4968 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kaniini	f3e8f5b1f2	Merge branch 'features/mastoapi/2.7.0-registration' into 'develop' ... Features/mastoapi/2.7.0 registration Closes #773 See merge request pleroma/pleroma!1134	2019-05-13 18:35:45 +00:00
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	2019-05-13 18:35:45 +00:00
kaniini	5a4d55cf91	Merge branch 'filter-irreversible' into 'develop' ... Make irreversible field, default to false in filters See merge request pleroma/pleroma!1144	2019-05-13 18:34:52 +00:00
Sachin Joshi	7701a4c841	Make irreversible field default to false in filters	2019-05-14 00:13:15 +05:45
lambda	16cb9e5f1c	Merge branch 'mascot/pleroma-tan-shy' into 'develop' ... pleroma-fox-tan-shy.png: Add another version of pleroma-tan See merge request pleroma/pleroma!1139	2019-05-13 15:52:05 +00:00
rinpatch	17f7c5e290	Merge branch 'fix/unfollows-not-working' into 'develop' ... Normalize the object in `create_or_bump_for` only after ensuring the activity type is Create Closes #874 See merge request pleroma/pleroma!1138	2019-05-13 07:39:12 +00:00
rinpatch	15cda998f3	Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type	2019-05-13 10:32:04 +03:00
rinpatch	3ded995253	Merge branch 'update-changelog' into 'develop' ... Update changelog See merge request pleroma/pleroma!1141	2019-05-12 13:22:13 +00:00
Sachin Joshi	2a4e41acb4	update changelog	2019-05-12 13:13:13 +05:45
Haelwenn (lanodan) Monnier	566a968ab3	pleroma-fox-tan-shy.png: Add another version of pleroma-tan ... Commissioned by https://shitposter.club/users/moonman and drawn by https://shpposter.club/users/Nightingalle Intended to be used when mastofe crashes out and allows to report a bug among other things. Should require a bit of modification on mastofe to use the image as it's more of a vanilla flavour thing.	2019-05-12 05:09:15 +02:00
rinpatch	b9f84a382a	Normalize the object only after ensuring the activity type is Create	2019-05-12 03:01:42 +03:00
kaniini	131f883207	Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' ... Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129	2019-05-11 16:52:26 +00:00
kaniini	8caea9be72	Merge branch 'fix/readme-release' into 'develop' ... Update release info in README.md See merge request pleroma/pleroma!1133	2019-05-11 16:51:47 +00:00
kaniini	1cb7a15727	Merge branch 'uniform-admin-api-url' into 'develop' ... make user related url uniform in admin api See merge request pleroma/pleroma!1135	2019-05-11 16:51:23 +00:00
Sachin Joshi	f01f995816	make url uniform in admin api	2019-05-11 14:46:00 +05:45
Francis Dinh	03dc19e7b0	Update release info in README.md ... Removed mention that there is no release of Pleroma (there actually has been a few the last couple of months).	2019-05-11 02:55:12 -04:00
Haelwenn	8d13c42926	Merge branch 'feature/adminfe' into 'develop' ... Feature/adminfe See merge request pleroma/pleroma!1116	2019-05-11 01:34:17 +00:00
feld	c953ae8c3d	Initial bundle of basic AdminFE ... Due to CSP headers we only allow connecting to self. If you want to host AdminFE on a separate domain without CSP headers you will be able to connect to any public Pleroma host.	2019-05-11 01:34:17 +00:00
rinpatch	1d78e42fd4	Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects	2019-05-10 13:49:34 +03:00
lambda	17d01869ea	Merge branch 'fix/retweet-language' into 'develop' ... Use "repeated" instead of "retweeted" for repeated statuses in Twitter API Closes pleroma-fe#533 See merge request pleroma/pleroma!1130	2019-05-10 09:49:46 +00:00
Francis Dinh	2a54e8c1f5	Use "repeated" instead of "retweeted" for repeated statuses in Twitter API ... This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533	2019-05-09 19:58:34 -04:00
rinpatch	e4523c3010	Fix get_in_reply_to in OStatus' activity representer depending on embedded objects	2019-05-09 22:27:00 +03:00
Haelwenn	e4bc4408f9	Merge branch 'improve/gitignore' into 'develop' ... Prevent committing code coverage results to the repo See merge request pleroma/pleroma!1128	2019-05-09 17:03:37 +00:00
Mark Felder	c869ec2504	Prevent committing code coverage results to the repo	2019-05-09 10:53:43 -05:00
kaniini	c2efc689d1	Merge branch 'feature/761-add-users-filtration' into 'develop' ... Feature/761 add users filtration Closes #761 See merge request pleroma/pleroma!1117	2019-05-08 14:34:36 +00:00
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	2019-05-08 14:34:36 +00:00
lambda	289b8224ac	Merge branch 'fix/851-emoji-redirect-follow' into 'develop' ... emoji dowload follow redirects Closes #851 See merge request pleroma/pleroma!1126	2019-05-08 13:13:59 +00:00
Alex S	a76e2622ca	emoji dowload follow redirects	2019-05-08 19:05:25 +07:00
lambda	aa8a6e7bec	Merge branch 'refactor/oauth_scopes' into 'develop' ... Refactoring functions for dealing with oauth scopes. See merge request pleroma/pleroma!1125	2019-05-08 10:52:14 +00:00
Maksim	799e1f48b5	Refactoring functions for dealing with oauth scopes.	2019-05-08 10:52:13 +00:00
kaniini	14deed7f7d	Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop' ... Optimize bookmarks by preloading them with activities Closes #861 See merge request pleroma/pleroma!1121	2019-05-07 19:37:41 +00:00
William Pitcock	d64c3b604e	twitterapi: use order constraint to force descending order	2019-05-07 19:33:25 +00:00
William Pitcock	6020ff3fb6	activitypub: add optional order constraint to timeline query builder	2019-05-07 19:33:22 +00:00
rinpatch	4c5125dedc	Remove bookmarks assoc and add a fake bookmark assoc instead	2019-05-07 19:33:22 +00:00
rinpatch	be067ec2ab	Use with_preloaded_bookmark in create_by_object_ap_id_with_object	2019-05-07 19:33:22 +00:00
rinpatch	3a7c14645e	- Actually use preloaded bookmarks in views ... - Preload bookmarks in bookmark timeline - Rework bookmark preload tests	2019-05-07 19:33:22 +00:00
rinpatch	f841eb7cdb	Preload bookmarks wherever the object is preloaded	2019-05-07 19:33:22 +00:00
rinpatch	06947c9147	Remove bookmarks assoc	2019-05-07 19:33:22 +00:00
kaniini	a1a0df19c4	Merge branch 'docs/MRF-modules' into 'develop' ... Documentation: MRF Modules See merge request pleroma/pleroma!1122	2019-05-07 16:15:27 +00:00
William Pitcock	e71ddf23ba	containment: remove pointless moduledoc line	2019-05-07 16:11:22 +00:00
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	2019-05-07 14:43:21 +00:00
rinpatch	6518644db1	Merge branch 'unused-config-parameter' into 'develop' ... unused config paramater See merge request pleroma/pleroma!1124	2019-05-07 02:35:31 +00:00
Alex S	f46295faa7	unused config paramater	2019-05-07 09:07:06 +07:00
rinpatch	d26998c2ac	Merge branch 'fix/ex_doc-source-links' into 'develop' ... Fix/ex_doc source links See merge request pleroma/pleroma!1123	2019-05-07 00:32:07 +00:00
xse	c81b707030	Fix/ex_doc source links	2019-05-07 00:32:07 +00:00
lambda	6b79be4a06	Merge branch 'issue_800' into 'develop' ... [#800] added ability renew access_token by refresh_token See merge request pleroma/pleroma!1045	2019-05-06 17:51:03 +00:00
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	2019-05-06 17:51:03 +00:00
lambda	aacac9da0b	Merge branch 'feature/bbs' into 'develop' ... BBS / SSH See merge request pleroma/pleroma!997	2019-05-06 17:17:03 +00:00
lambda	4dabf64af4	Merge branch 'feature/845-improve-status-deletion' into 'develop' ... Improve status deletion Closes #845 See merge request pleroma/pleroma!1104	2019-05-06 16:45:22 +00:00
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	2019-05-06 16:45:22 +00:00