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
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
lain
a33bec7d58
Conversations: Import order, import as read.
2019-05-09 16:39:28 +02:00
lain
e6d7f8d223
Credo fixes.
2019-05-08 18:19:20 +02:00
lain
6d19bb4eae
Conversations: Add mix task to 'import' old DMs.
2019-05-08 18:09:07 +02:00
lain
a4598b5e8b
Visibility: Make it more resilient.
2019-05-08 18:08:50 +02:00
lain
920bd47055
ActivityPub: Remove leftover printf debugging.
2019-05-08 17:40:24 +02:00
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
2019-05-08 17:37:00 +02: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
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07: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
Haelwenn (lanodan) Monnier
69a5074893
Remove H1 in @moduledoc
2019-05-06 04:53:12 +02:00
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?
2019-05-06 04:53:11 +02:00
Haelwenn (lanodan) Monnier
af62ace954
Add short documentation on every MRF Policy
2019-05-06 04:49:50 +02:00
lain
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
lain
c58fd4c038
BBS: Fix tests.
2019-05-04 15:36:48 +02:00
lain
c9d1cb2dce
BBS: Use cached user fetcher.
2019-05-04 15:08:07 +02:00
lain
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00