summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-13Merge branch 'changelog/adminfe' into 'develop'rinpatch
Document AdminFE in changelog See merge request pleroma/pleroma!1147
2019-05-13Document AdminFE in changelogMark Felder
2019-05-13Merge branch 'bump-mastoapi' into 'develop'kaniini
Bump Mastodon API level See merge request pleroma/pleroma!1146
2019-05-13Bump Mastodon API levelMark Felder
2019-05-13Merge branch 'refactor/jason' into 'develop'kaniini
Switch to Jason over Poison See merge request pleroma/pleroma!1145
2019-05-13Switch to Jason over PoisonMark Felder
2019-05-13Merge branch 'feature/federator-behaviours' into 'develop'lambda
federator modularization (outgoing) See merge request pleroma/pleroma!1140
2019-05-13Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'kaniini
Features/mastoapi/2.7.0 registration Closes #773 See merge request pleroma/pleroma!1134
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
[ci skip]
2019-05-13Merge branch 'filter-irreversible' into 'develop'kaniini
Make irreversible field, default to false in filters See merge request pleroma/pleroma!1144
2019-05-14Make irreversible field default to false in filtersSachin Joshi
2019-05-13Merge branch 'mascot/pleroma-tan-shy' into 'develop'lambda
pleroma-fox-tan-shy.png: Add another version of pleroma-tan See merge request pleroma/pleroma!1139
2019-05-13Merge branch 'fix/unfollows-not-working' into 'develop'rinpatch
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-13Add a test to ensure create_or_bump_for does not normalize objects before ↵rinpatch
checking the activity type
2019-05-12nodeinfo: gather supported protocol names from federation modulesWilliam Pitcock
2019-05-12webfinger: build the response based on enabled federation modulesWilliam Pitcock
2019-05-12xml builder: properly escape quotesWilliam Pitcock
2019-05-12tests: fix AP test failuresWilliam Pitcock
2019-05-12tests: fix salmon testsWilliam Pitcock
2019-05-12Merge branch 'update-changelog' into 'develop'rinpatch
Update changelog See merge request pleroma/pleroma!1141
2019-05-12update changelogSachin Joshi
2019-05-12tests: chase federator publish_single_foo removalsWilliam Pitcock
2019-05-12federator: websub removalWilliam Pitcock
2019-05-12activitypub: publisher: fixupsWilliam Pitcock
2019-05-12websub: adapt to work as a federator publishing moduleWilliam Pitcock
2019-05-12salmon: refactor to work as a federator publishing moduleWilliam Pitcock
2019-05-12federator: publisher: only attempt publishing if we know the activity is ↵William Pitcock
representable
2019-05-12ostatus: only as:Public activities are representableWilliam Pitcock
2019-05-12federator: move activitypub relaying to the AP publisher moduleWilliam Pitcock
2019-05-12federator: hook up Publisher.publish()William Pitcock
2019-05-12federator: remove no longer used :publish_single_apWilliam Pitcock
2019-05-12federator: publisher: add publish() wrapperWilliam Pitcock
2019-05-12federator: publisher: integrate job queue, simplify publish_one logicWilliam Pitcock
2019-05-12activitypub: split out outgoing federation into a federation moduleWilliam Pitcock
2019-05-12pleroma-fox-tan-shy.png: Add another version of pleroma-tanHaelwenn (lanodan) Monnier
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-12federator: add publisher module defining a contract for publishing behavioursWilliam Pitcock
2019-05-12Normalize the object only after ensuring the activity type is Createrinpatch
2019-05-11Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' ↵kaniini
into 'develop' Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129
2019-05-11Merge branch 'fix/readme-release' into 'develop'kaniini
Update release info in README.md See merge request pleroma/pleroma!1133
2019-05-11Merge branch 'uniform-admin-api-url' into 'develop'kaniini
make user related url uniform in admin api See merge request pleroma/pleroma!1135
2019-05-11make url uniform in admin apiSachin Joshi
2019-05-11Update release info in README.mdFrancis Dinh
Removed mention that there is no release of Pleroma (there actually has been a few the last couple of months).
2019-05-11Merge branch 'feature/adminfe' into 'develop'Haelwenn
Feature/adminfe See merge request pleroma/pleroma!1116
2019-05-11Initial bundle of basic AdminFEfeld
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-10Remove get_in_reply_to calls in some functions because the result is unused ↵rinpatch
and it does not have any side-effects
2019-05-10Merge branch 'fix/retweet-language' into 'develop'lambda
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API Closes pleroma-fe#533 See merge request pleroma/pleroma!1130
2019-05-09Use "repeated" instead of "retweeted" for repeated statuses in Twitter APIFrancis Dinh
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-09Fix get_in_reply_to in OStatus' activity representer depending on embedded ↵rinpatch
objects
2019-05-09Merge branch 'improve/gitignore' into 'develop'Haelwenn
Prevent committing code coverage results to the repo See merge request pleroma/pleroma!1128
2019-05-09Prevent committing code coverage results to the repoMark Felder