summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-12Merge branch 'update-changelog' into 'develop'rinpatch
Update changelog See merge request pleroma/pleroma!1141
2019-05-12update changelogSachin Joshi
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-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
2019-05-08Merge branch 'feature/761-add-users-filtration' into 'develop'kaniini
Feature/761 add users filtration Closes #761 See merge request pleroma/pleroma!1117
2019-05-08Merge developAlexander Strizhakov
Merge conflict in lib/pleroma/activity.ex
2019-05-08Merge branch 'fix/851-emoji-redirect-follow' into 'develop'lambda
emoji dowload follow redirects Closes #851 See merge request pleroma/pleroma!1126
2019-05-08emoji dowload follow redirectsAlex S
2019-05-08Merge branch 'refactor/oauth_scopes' into 'develop'lambda
Refactoring functions for dealing with oauth scopes. See merge request pleroma/pleroma!1125
2019-05-08Refactoring functions for dealing with oauth scopes.Maksim
2019-05-07Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'kaniini
Optimize bookmarks by preloading them with activities Closes #861 See merge request pleroma/pleroma!1121
2019-05-07twitterapi: use order constraint to force descending orderWilliam Pitcock
2019-05-07activitypub: add optional order constraint to timeline query builderWilliam Pitcock
2019-05-07Remove `bookmarks` assoc and add a fake `bookmark` assoc insteadrinpatch
2019-05-07Use with_preloaded_bookmark in create_by_object_ap_id_with_objectrinpatch
2019-05-07- Actually use preloaded bookmarks in viewsrinpatch
- Preload bookmarks in bookmark timeline - Rework bookmark preload tests
2019-05-07Preload bookmarks wherever the object is preloadedrinpatch
2019-05-07Remove bookmarks assocrinpatch
2019-05-07Merge branch 'docs/MRF-modules' into 'develop'kaniini
Documentation: MRF Modules See merge request pleroma/pleroma!1122
2019-05-07containment: remove pointless moduledoc lineWilliam Pitcock
2019-05-07Merge branch 'conversations_three' into 'develop'lambda
Conversations once more. See merge request pleroma/pleroma!1119
2019-05-07Merge branch 'unused-config-parameter' into 'develop'rinpatch
unused config paramater See merge request pleroma/pleroma!1124
2019-05-07unused config paramaterAlex S
2019-05-07Merge branch 'fix/ex_doc-source-links' into 'develop'rinpatch
Fix/ex_doc source links See merge request pleroma/pleroma!1123
2019-05-07Fix/ex_doc source linksxse
2019-05-06Merge branch 'issue_800' into 'develop'lambda
[#800] added ability renew access_token by refresh_token See merge request pleroma/pleroma!1045
2019-05-06fix formatMaksim
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
BBS / SSH See merge request pleroma/pleroma!997
2019-05-06Merge branch 'feature/845-improve-status-deletion' into 'develop'lambda
Improve status deletion Closes #845 See merge request pleroma/pleroma!1104
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
2019-05-06Remove H1 in @moduledocHaelwenn (lanodan) Monnier
2019-05-06mrf/tag_policy.ex: Add some documentationHaelwenn (lanodan) Monnier
mrf_tag:disable-remote-subscription exact way of working is quite unclear to me. Is it the requester that is denied if they have a tag, or is it the requestee if they have one?
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 21:52:58 +0000