sadposter
|
ff552c5151
|
FE
|
2020-01-29 10:56:34 +00:00 |
|
sadposter
|
4646d3c9d6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-01-23 11:55:07 +00:00 |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
2020-01-21 10:32:27 +03:00 |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
2020-01-20 12:17:14 +01:00 |
|
Alex S
|
2753285b77
|
config editing through database
|
2020-01-10 15:51:59 +03:00 |
|
sadposter
|
5f4fc0c373
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-23 19:07:20 +00:00 |
|
Egor Kislitsyn
|
ee6805850c
|
Set log level to debug for not important messages
|
2019-12-11 17:47:19 +07:00 |
|
sadposter
|
9d29a5063c
|
fe
|
2019-11-20 09:48:05 +00:00 |
|
Ariadne Conill
|
eecd64cc07
|
object age policy: remove debug logging
|
2019-11-14 19:56:14 -06:00 |
|
Ariadne Conill
|
5705cf0e3e
|
MRF: add ObjectAgePolicy which deals with old posts being imported
|
2019-11-14 19:48:10 -06:00 |
|
sadposter
|
1d85dc62aa
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-25 12:08:37 +01:00 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
sadposter
|
58f9ce0deb
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-10 10:28:16 +01:00 |
|
Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
2019-10-07 03:49:57 +02:00 |
|
sadposter
|
4714b739a7
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-09-16 12:14:48 +01:00 |
|
sadposter
|
c2a1bac5de
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-09-05 12:08:45 +01:00 |
|
Ivan Tashkinov
|
dd017c65a4
|
[#1149] Refactored Oban workers API (introduced enqueue/3).
|
2019-08-31 21:58:42 +03:00 |
|
Ivan Tashkinov
|
a90ea8ba15
|
[#1149] Addressed code review comments (code style, jobs pruning etc.).
|
2019-08-31 19:08:56 +03:00 |
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
2019-08-31 14:25:43 +03:00 |
|
feld
|
7853b3f17d
|
Fix AntiFollowbotPolicy when trying to follow a relay
|
2019-08-30 00:38:03 +00:00 |
|
sadposter
|
62487e3976
|
fix gab rewrite
|
2019-08-27 08:58:47 +01:00 |
|
Ivan Tashkinov
|
256ff09aa8
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
2019-08-22 20:59:58 +03:00 |
|
sadposter
|
1da00eb1b0
|
add describe to gab rewrite
|
2019-08-16 10:58:32 +01:00 |
|
sadposter
|
3fc4b078f2
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-08-16 10:54:53 +01:00 |
|
Ariadne Conill
|
626e094589
|
MRF: fix up unserializable option lists in describe implementations
|
2019-08-14 18:54:17 +00:00 |
|
Ivan Tashkinov
|
8778c16dac
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-08-14 21:44:50 +03:00 |
|
rinpatch
|
9ef31767f2
|
Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary
See merge request pleroma/pleroma!1559
|
2019-08-13 22:51:15 +00:00 |
|
Ariadne Conill
|
abfbcfdcb3
|
mrf_vocabulary: add describe API support
|
2019-08-13 22:39:26 +00:00 |
|
Ariadne Conill
|
4244e17de0
|
fix credo
|
2019-08-13 22:36:24 +00:00 |
|
Ariadne Conill
|
c574b7a1fc
|
MRF: add describe() to all modules, add base MRF configuration to base describe()
|
2019-08-13 22:08:58 +00:00 |
|
Ariadne Conill
|
3fdbeb7087
|
MRF: add vocabulary policy module
|
2019-08-13 20:55:38 +00:00 |
|
Ivan Tashkinov
|
0e1c481a94
|
[#1149] Added more oban workers. Refactoring.
|
2019-08-13 20:20:26 +03:00 |
|
sadposter
|
3cc6cb266b
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-31 14:23:03 +01:00 |
|
Ariadne Conill
|
b93498eb52
|
constants: add as_public constant and use it everywhere
|
2019-07-29 02:43:19 +00:00 |
|
sadposter
|
ef7466921b
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-23 20:29:00 +01:00 |
|
Alexander Strizhakov
|
b70e659304
|
Feature/1087 wildcard option for blocks
|
2019-07-22 14:33:58 +00:00 |
|
sadposter
|
234b2b8edb
|
update gab rewrite
|
2019-07-20 14:36:13 +01:00 |
|
sadposter
|
c2737d13df
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-20 14:28:30 +01:00 |
|
RX14
|
96a2890a9e
|
Add MRF MentionPolicy for dropping posts which mention specific actors
|
2019-07-17 15:16:55 +01:00 |
|
sadposter
|
d4348eeb62
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-14 22:03:20 +01:00 |
|
Maksim
|
bb8065a1fd
|
tests MRF filters
|
2019-07-10 05:12:21 +00:00 |
|
sadposter
|
ed709aec2c
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-06 18:41:06 +01:00 |
|
William Pitcock
|
034986e1fd
|
MRF: add mediaproxy warming policy
|
2019-06-28 23:19:20 +00:00 |
|
sadposter
|
3a71016699
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-06-25 12:40:02 +01:00 |
|
sadposter
|
8adad157b7
|
Add gab rewrite policy
|
2019-06-24 13:08:09 +01:00 |
|
William Pitcock
|
127a5a7d65
|
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
|
2019-06-21 22:27:14 +00:00 |
|
William Pitcock
|
21dacd4b15
|
unbreak polls
|
2019-06-19 16:33:49 +00:00 |
|
William Pitcock
|
736d8ad6be
|
implement anti link spam MRF
|
2019-06-19 15:58:32 +00:00 |
|
William Pitcock
|
561a21986d
|
formatting
|
2019-06-02 10:29:15 +00:00 |
|
William Pitcock
|
4087ccdab8
|
mrf: add subchain policy
|
2019-06-02 10:07:42 +00:00 |
|