William Pitcock
|
c4a55e167a
|
add Changelog entry
|
2019-05-17 23:00:14 +00:00 |
|
William Pitcock
|
dc08159538
|
also suppress link previews from posts marked #nsfw
|
2019-05-17 22:13:24 +00:00 |
|
William Pitcock
|
0da1233e8e
|
rich media: suppress link previews if post is marked as sensitive
|
2019-05-17 18:49:43 +00:00 |
|
William Pitcock
|
78588dbd80
|
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
|
2019-05-17 18:49:10 +00:00 |
|
lain
|
412a3d8a0f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
|
2019-05-17 12:26:59 +02:00 |
|
lambda
|
e5b34f5e05
|
Merge branch 'ecto_sql_update' into 'develop'
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
|
2019-05-17 10:21:38 +00:00 |
|
lambda
|
1dcdcd8871
|
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
|
2019-05-17 10:07:51 +00:00 |
|
lambda
|
46684db84d
|
Update account_view.ex
|
2019-05-17 09:53:44 +00:00 |
|
lain
|
249b31ffe5
|
Fix specs.
|
2019-05-17 11:49:13 +02:00 |
|
Alexander Strizhakov
|
7ed682213f
|
Fix/902 random compile failing
|
2019-05-17 07:25:20 +00:00 |
|
Haelwenn (lanodan) Monnier
|
68c75a08e8
|
MastoAPI account_view.ex: requested is false when following is true
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
|
2019-05-17 07:44:09 +02:00 |
|
Aaron Tinio
|
70235ce840
|
Fix typo: s/"tags"/"tag"/g
|
2019-05-17 09:02:34 +08:00 |
|
kaniini
|
bf84d50c76
|
Merge branch 'feature/890-add-report-uri' into 'develop'
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
|
2019-05-16 20:11:12 +00:00 |
|
Sergey Suprunenko
|
2c303afc8b
|
Remove duplicated entries in users' following lists
|
2019-05-16 20:04:08 +00:00 |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
|
|
e190b3022b
|
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
|
2019-05-16 18:57:14 +00:00 |
|
Mark Felder
|
ebb0482116
|
Merge branch 'develop' into conversations-import
|
2019-05-16 13:11:17 -05:00 |
|
lambda
|
fde30aee43
|
Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver
See merge request pleroma/pleroma!971
|
2019-05-16 13:44:22 +00:00 |
|
Alexander Strizhakov
|
73ae58fdfa
|
Feature/896 toggling confirmation
|
2019-05-16 13:23:41 +00:00 |
|
Alex S
|
9d14214eb9
|
Merge branch 'develop' into feature/890-add-report-uri
|
2019-05-16 12:54:06 +07:00 |
|
Alex S
|
aa11fa4864
|
add report uri and report to
|
2019-05-16 12:49:40 +07:00 |
|
William Pitcock
|
c31026423c
|
publisher: use the correct queue name for outgoing federation
|
2019-05-16 04:41:27 +00:00 |
|
Aaron Tinio
|
793f1834d2
|
Use named binding to conditionally join object
|
2019-05-16 06:25:14 +08:00 |
|
Aaron Tinio
|
2b6119dfbf
|
Restrict reblogs of activities from blocked domains
|
2019-05-16 05:53:51 +08:00 |
|
William Pitcock
|
a591ab6112
|
activity pub: remove Ecto SQL query dumps
|
2019-05-15 16:56:46 +00:00 |
|
William Pitcock
|
f09c3afdf5
|
chase test failures
|
2019-05-15 16:23:01 +00:00 |
|
William Pitcock
|
0aada88b55
|
bbs: chase timeline containment patch
|
2019-05-15 16:02:15 +00:00 |
|
William Pitcock
|
31db31c587
|
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
|
2019-05-15 15:54:10 +00:00 |
|
William Pitcock
|
de114ffbb0
|
activitypub: remove contain_timeline()
|
2019-05-15 15:53:06 +00:00 |
|
William Pitcock
|
0387f52138
|
activitypub: add restrict_thread_visibility()
|
2019-05-15 15:53:06 +00:00 |
|
lain
|
f168a1cbdc
|
Merge remote-tracking branch 'origin/develop' into conversations-import
|
2019-05-15 17:47:29 +02:00 |
|
kaniini
|
62516be9c4
|
Merge branch 'fix/public-option-not-working' into 'develop'
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
|
2019-05-15 15:42:21 +00:00 |
|
lambda
|
4440e23547
|
Merge branch 'chore/extricate-http-signatures' into 'develop'
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
|
2019-05-15 15:37:31 +00:00 |
|
lain
|
7a92e701b9
|
CommonAPI: Visibility refactor.
|
2019-05-15 16:35:33 +02:00 |
|
lain
|
cbb3451023
|
CommonAPI: Refactor visibility, forbid public to private replies.
|
2019-05-15 16:30:08 +02:00 |
|
lain
|
f1e67bdc31
|
Search: Add optional rum indexing / searching.
|
2019-05-15 15:28:01 +02:00 |
|
Sachin Joshi
|
ee22fff5ac
|
remove deprecated PleromaFE configuration
|
2019-05-15 15:29:59 +05:45 |
|
Aaron Tinio
|
70c81b95d0
|
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
|
2019-05-15 05:09:32 +08:00 |
|
Aaron Tinio
|
7b8dc99ef1
|
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
|
2019-05-15 05:09:29 +08:00 |
|
William Pitcock
|
071f78733a
|
switch to pleroma/http_signatures library
|
2019-05-14 20:03:13 +00:00 |
|
Mark Felder
|
1caa6331ea
|
Group def perform() together to fix the build
|
2019-05-14 12:33:03 -05:00 |
|
lambda
|
fa4bd898f1
|
Merge branch 'fix/gopher' into 'develop'
gopher: fix rendering of post content (closes #895)
Closes #895
See merge request pleroma/pleroma!1150
|
2019-05-14 15:41:37 +00:00 |
|
William Pitcock
|
51325fd60c
|
gopher: fix rendering of post content (closes #895)
|
2019-05-14 15:35:06 +00:00 |
|
lambda
|
692919c7d2
|
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
|
2019-05-14 15:27:34 +00:00 |
|
William Pitcock
|
ac3a3abf6b
|
clean up follow/block imports a little
|
2019-05-14 15:07:38 +00:00 |
|
kaniini
|
dfd031c26a
|
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
|
2019-05-14 14:58:45 +00:00 |
|
Maksim
|
52297920e7
|
Refactoring oauth response.
|
2019-05-14 14:49:45 +00:00 |
|
Egor Kislitsyn
|
b92c004ea8
|
Reuse query from User.restrict_deactivated/1
|
2019-05-14 18:29:10 +07:00 |
|
Egor Kislitsyn
|
5e2b491276
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
2019-05-14 18:15:56 +07:00 |
|
Aaron Tinio
|
a18b2c0b12
|
Fix Pleroma.Config.get!/1 raising an error when value is false
|
2019-05-14 06:40:59 +08:00 |
|
