rinpatch
642a67dd44
Render polls in statuses
5 years ago
rinpatch
62e42b03ab
Handle incoming Question objects
5 years ago
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
5 years ago
kaniini
8caea9be72
Merge branch 'fix/readme-release' into 'develop'
...
Update release info in README.md
See merge request pleroma/pleroma!1133
5 years ago
kaniini
1cb7a15727
Merge branch 'uniform-admin-api-url' into 'develop'
...
make user related url uniform in admin api
See merge request pleroma/pleroma!1135
5 years ago
Sachin Joshi
f01f995816
make url uniform in admin api
5 years ago
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).
5 years ago
Haelwenn
8d13c42926
Merge branch 'feature/adminfe' into 'develop'
...
Feature/adminfe
See merge request pleroma/pleroma!1116
5 years ago
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.
5 years ago
rinpatch
1d78e42fd4
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
5 years ago
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
5 years ago
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
5 years ago
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
Haelwenn
e4bc4408f9
Merge branch 'improve/gitignore' into 'develop'
...
Prevent committing code coverage results to the repo
See merge request pleroma/pleroma!1128
5 years ago
Mark Felder
c869ec2504
Prevent committing code coverage results to the repo
5 years ago
kaniini
c2efc689d1
Merge branch 'feature/761-add-users-filtration' into 'develop'
...
Feature/761 add users filtration
Closes #761
See merge request pleroma/pleroma!1117
5 years ago
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
lambda
289b8224ac
Merge branch 'fix/851-emoji-redirect-follow' into 'develop'
...
emoji dowload follow redirects
Closes #851
See merge request pleroma/pleroma!1126
5 years ago
Alex S
a76e2622ca
emoji dowload follow redirects
5 years ago
lambda
aa8a6e7bec
Merge branch 'refactor/oauth_scopes' into 'develop'
...
Refactoring functions for dealing with oauth scopes.
See merge request pleroma/pleroma!1125
5 years ago
Maksim
799e1f48b5
Refactoring functions for dealing with oauth scopes.
5 years ago
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
5 years ago
William Pitcock
d64c3b604e
twitterapi: use order constraint to force descending order
5 years ago
William Pitcock
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
5 years ago
rinpatch
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch
be067ec2ab
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
5 years ago
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
5 years ago
rinpatch
06947c9147
Remove bookmarks assoc
5 years ago
kaniini
a1a0df19c4
Merge branch 'docs/MRF-modules' into 'develop'
...
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
5 years ago
William Pitcock
e71ddf23ba
containment: remove pointless moduledoc line
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
rinpatch
6518644db1
Merge branch 'unused-config-parameter' into 'develop'
...
unused config paramater
See merge request pleroma/pleroma!1124
5 years ago
Alex S
f46295faa7
unused config paramater
5 years ago
rinpatch
d26998c2ac
Merge branch 'fix/ex_doc-source-links' into 'develop'
...
Fix/ex_doc source links
See merge request pleroma/pleroma!1123
5 years ago
xse
c81b707030
Fix/ex_doc source links
5 years ago
lambda
6b79be4a06
Merge branch 'issue_800' into 'develop'
...
[#800 ] added ability renew access_token by refresh_token
See merge request pleroma/pleroma!1045
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
lambda
4dabf64af4
Merge branch 'feature/845-improve-status-deletion' into 'develop'
...
Improve status deletion
Closes #845
See merge request pleroma/pleroma!1104
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
Haelwenn (lanodan) Monnier
69a5074893
Remove H1 in @moduledoc
5 years ago
Haelwenn (lanodan) Monnier
e41a2f98d5
mrf/tag_policy.ex: Add some documentation
...
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?
5 years ago
Haelwenn (lanodan) Monnier
af62ace954
Add short documentation on every MRF Policy
5 years ago
lain
eb0fb73ddb
BBS: Credo fixes.
5 years ago
lain
c58fd4c038
BBS: Fix tests.
5 years ago
lain
c9d1cb2dce
BBS: Use cached user fetcher.
5 years ago
lain
4c76f49e60
BBS: small fixes.
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
rinpatch
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
5 years ago