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
e7d292f80e
federator: add publisher module defining a contract for publishing behaviours
2019-05-12 03:08:50 +00:00
b9f84a382a
Normalize the object only after ensuring the activity type is Create
2019-05-12 03:01:42 +03:00
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
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
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
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
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
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
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
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
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
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
2019-05-09 22:27:00 +03:00
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
c869ec2504
Prevent committing code coverage results to the repo
2019-05-09 10:53:43 -05:00
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
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
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
a76e2622ca
emoji dowload follow redirects
2019-05-08 19:05:25 +07:00
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
799e1f48b5
Refactoring functions for dealing with oauth scopes.
2019-05-08 10:52:13 +00:00
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
d64c3b604e
twitterapi: use order constraint to force descending order
2019-05-07 19:33:25 +00:00
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
2019-05-07 19:33:22 +00:00
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
2019-05-07 19:33:22 +00:00
be067ec2ab
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
2019-05-07 19:33:22 +00:00
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
2019-05-07 19:33:22 +00:00
f841eb7cdb
Preload bookmarks wherever the object is preloaded
2019-05-07 19:33:22 +00:00
06947c9147
Remove bookmarks assoc
2019-05-07 19:33:22 +00:00
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
e71ddf23ba
containment: remove pointless moduledoc line
2019-05-07 16:11:22 +00:00
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
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
f46295faa7
unused config paramater
2019-05-07 09:07:06 +07:00
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
c81b707030
Fix/ex_doc source links
2019-05-07 00:32:07 +00:00
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
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
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
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
69a5074893
Remove H1 in @moduledoc
2019-05-06 04:53:12 +02:00
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?
2019-05-06 04:53:11 +02:00
af62ace954
Add short documentation on every MRF Policy
2019-05-06 04:49:50 +02:00
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
c58fd4c038
BBS: Fix tests.
2019-05-04 15:36:48 +02:00
c9d1cb2dce
BBS: Use cached user fetcher.
2019-05-04 15:08:07 +02:00
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
Haelwenn (lanodan) Monnier
feld