sadposter
|
3357780ea8
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-05-20 19:36:57 +01:00 |
|
kaniini
|
943d1b2f26
|
Merge branch 'feature/user-configurable-mascot' into 'develop'
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
|
2019-05-20 18:17:42 +00:00 |
|
kaniini
|
643b563478
|
Merge branch 'doc/mrf-simple-report-removal' into 'develop'
Document MRF.Simple :report_removal
See merge request pleroma/pleroma!1179
|
2019-05-20 18:16:29 +00:00 |
|
Aaron Tinio
|
5aa107d912
|
Document MRF.Simple :report_removal
|
2019-05-21 00:59:12 +08:00 |
|
Sadposter
|
daeae8e2e7
|
Move default mascot configuration to config/
|
2019-05-20 16:12:55 +01:00 |
|
Sadposter
|
d835810610
|
Add changelog entry for mascot config
|
2019-05-20 14:19:42 +01:00 |
|
Sadposter
|
3d0d9e7a56
|
Use string map for default mascot
|
2019-05-20 13:10:04 +01:00 |
|
Sadposter
|
dc916ba15f
|
Format mascot tests
|
2019-05-20 12:58:17 +01:00 |
|
Sadposter
|
e81f0fc6d4
|
Add mascot get/set tests
|
2019-05-20 12:58:06 +01:00 |
|
Sadposter
|
54e9cb5c2d
|
Add API endpoints for a custom user mascot
|
2019-05-20 12:39:23 +01:00 |
|
kaniini
|
b30b51c3b7
|
Merge branch 'feature/mrf-simple-report-filtering' into 'develop'
Add report filtering to MRF.SimplePolicy
Closes #610
See merge request pleroma/pleroma!1176
|
2019-05-19 22:30:10 +00:00 |
|
Aaron Tinio
|
2375e9a95b
|
Add report filtering to MRF.SimplePolicy
|
2019-05-20 06:02:50 +08:00 |
|
rinpatch
|
8e9a764dfc
|
Merge branch 'feature/mrf-always-nsfw' into 'develop'
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
|
2019-05-18 07:13:18 +00:00 |
|
Haelwenn
|
cd7a6a25d2
|
Merge branch 'feature/http-ua-header-always' into 'develop'
http: request builder: send user-agent when making requests
Closes #546
See merge request pleroma/pleroma!1174
|
2019-05-18 04:42:11 +00:00 |
|
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
|
c234ce546a
|
add CHANGELOG entry
|
2019-05-17 20:31:39 +00:00 |
|
William Pitcock
|
290f5b2cfe
|
config: make sending the user agent configurable, disable sending the user agent in tests
|
2019-05-17 20:28:58 +00:00 |
|
William Pitcock
|
d3b8cd342f
|
http: request builder: send user-agent when making requests
|
2019-05-17 19:04:17 +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 |
|
rinpatch
|
d2dacadb6b
|
Merge branch 'rum-index' into 'develop'
Search: Use RUM index.
See merge request pleroma/pleroma!1136
|
2019-05-17 16:35:19 +00:00 |
|
lain
|
ef63cf7088
|
CI: Use the correct image with the correct hostname.
|
2019-05-17 15:30:50 +02:00 |
|
lain
|
8784a7d1b4
|
RUM: Set rum status by the environment.
|
2019-05-17 15:21:24 +02:00 |
|
lain
|
022e6e4b44
|
RUM: Remove vacuum analyze from migration
Can't be run in a trnasaction.
|
2019-05-17 14:59:01 +02:00 |
|
lain
|
a3fc7294da
|
CI: Add rum variant testing.
|
2019-05-17 14:26:07 +02: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
|
0498fa244f
|
Merge branch 'update-tzdata' into 'develop'
Dependencies: Update tzdata.
Closes #910
See merge request pleroma/pleroma!1171
|
2019-05-17 10:21:14 +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
|
5743124c77
|
Dependencies: Update tzdata.
This fixes the bug that tz data could not be loaded. Closes #910.
|
2019-05-17 11:51:50 +02:00 |
|
lain
|
249b31ffe5
|
Fix specs.
|
2019-05-17 11:49:13 +02:00 |
|
lain
|
67af50ec71
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
|
2019-05-17 11:33:04 +02:00 |
|
lain
|
e39c190f04
|
Configuration: disable migration lock.
|
2019-05-17 11:30:35 +02:00 |
|
lain
|
718b59a263
|
Dependencies: Update ecto sql once more.
|
2019-05-17 11:19:30 +02:00 |
|
rinpatch
|
3e5301ad5c
|
Merge branch 'fix/902-random-compile-failing' into 'develop'
Fix/902 random compile failing
Closes #902
See merge request pleroma/pleroma!1168
|
2019-05-17 07:25:20 +00: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 |
|
kaniini
|
99f50bf3e8
|
Merge branch 'fix/mrf-tag-typo' into 'develop'
Fix MRF "tag" typo
See merge request pleroma/pleroma!1167
|
2019-05-17 01:20:04 +00:00 |
|
Aaron Tinio
|
443cd68a4c
|
Add tests for MRF.SimplePolicy
|
2019-05-17 09:02:34 +08: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 |
|
|
|
a328251a52
|
Merge branch 'feature/task-update-following' into 'develop'
Remove duplicated entries in users' following lists
Closes #888
See merge request pleroma/pleroma!1166
|
2019-05-16 20:04:08 +00:00 |
|
Sergey Suprunenko
|
2c303afc8b
|
Remove duplicated entries in users' following lists
|
2019-05-16 20:04:08 +00:00 |
|
sadposter
|
c0b7bc2927
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-05-16 20:24:43 +01:00 |
|
sadposter
|
7f40b66d51
|
add emojo
|
2019-05-16 20:24:29 +01:00 |
|
|
|
0f8892686a
|
Merge branch 'feature/admin-api-reports' into 'develop'
Add Reports to Admin API
Closes #774
See merge request pleroma/pleroma!1107
|
2019-05-16 19:09:19 +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 |
|
