Roman Chvanikov
|
8292331b35
|
Merge branch 'develop' into feature/digest-email
|
2019-07-20 16:41:58 +03:00 |
|
Roman Chvanikov
|
36049f08ef
|
Merge develop
|
2019-07-20 01:03:25 +03:00 |
|
feld
|
93df0796f0
|
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
|
2019-07-19 21:59:18 +00:00 |
|
Mark Felder
|
9169f331b6
|
Merge branch 'develop' into feature/matstodon-statuses-by-name
|
2019-07-19 16:55:10 -05:00 |
|
kaniini
|
33729bbb28
|
Merge branch 'feature/richmedia-ttl' into 'develop'
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
|
2019-07-19 21:36:36 +00:00 |
|
tom79
|
5c4a555b1d
|
Fix domain for the contact clients.md
|
2019-07-19 08:40:47 +00:00 |
|
tom79
|
b0b9eca37d
|
Update clients.md for Fedilab
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
|
2019-07-19 08:39:22 +00:00 |
|
Sachin Joshi
|
581756ccc5
|
update the docs
|
2019-07-19 11:50:47 +05:45 |
|
Sachin Joshi
|
de9906ad56
|
change the structure of image ttl parsar
|
2019-07-19 11:43:42 +05:45 |
|
kaniini
|
f9a0014681
|
Merge branch 'feature/signed-object-fetches' into 'develop'
signed object fetches
See merge request pleroma/pleroma!1446
|
2019-07-18 13:27:50 +00:00 |
|
aries
|
129078eddc
|
Fix redirect setting not working
|
2019-07-18 21:08:31 +09:00 |
|
tallship
|
cffe8229a5
|
Update clients.md - added Homepage for Fedilab Android app
|
2019-07-17 23:03:46 +00:00 |
|
Bradley D. Thornton
|
cdecef2a08
|
Update otp_en.md - Added creation of initial admin user
|
2019-07-17 22:35:16 +00:00 |
|
Ariadne Conill
|
b2a8ccf37f
|
config: add sign_object_fetches option
|
2019-07-17 21:38:06 +00:00 |
|
kaniini
|
ce73d5f6a5
|
Merge branch 'feature/mention-mrf' into 'develop'
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
|
2019-07-17 15:28:41 +00:00 |
|
RX14
|
96a2890a9e
|
Add MRF MentionPolicy for dropping posts which mention specific actors
|
2019-07-17 15:16:55 +01:00 |
|
Sachin Joshi
|
18234cc44e
|
add the rich media ttl based on image exp time
|
2019-07-17 00:20:34 +05:45 |
|
Ivan Tashkinov
|
2ba07b63f4
|
Apply suggestion to docs/config.md
|
2019-07-16 16:59:02 +00:00 |
|
Ivan Tashkinov
|
889dc17abd
|
[#1094] Rate-limited follow & unfollow actions.
|
2019-07-16 19:18:30 +03:00 |
|
Roman Chvanikov
|
9bca70b10a
|
Merge develop
|
2019-07-16 16:19:19 +03:00 |
|
Eugenij
|
520ee6c591
|
Add pleroma.deactivated to the Account entity (Mastodon API)
|
2019-07-16 11:14:46 +00:00 |
|
Mark Felder
|
ffb4eb9779
|
Merge branch 'develop' into feature/matstodon-statuses-by-name
|
2019-07-15 17:10:27 -05:00 |
|
Eugenij
|
345a38778e
|
Remove dead link from the installation docs
|
2019-07-15 21:43:04 +00:00 |
|
Egor Kislitsyn
|
0c66bb5857
|
Update documentation
|
2019-07-15 14:27:56 +07:00 |
|
Egor Kislitsyn
|
64a946643e
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-07-15 14:11:54 +07:00 |
|
Roman Chvanikov
|
c729883936
|
Merge branch 'develop' into feature/digest-email
|
2019-07-14 21:43:30 +03:00 |
|
Alex S
|
7af27c143d
|
changelog & docs
|
2019-07-14 09:23:43 +03:00 |
|
Ariadne Conill
|
0cc638b968
|
docs: note that exclusions usage will be included in the transparency metrics if used
|
2019-07-13 19:00:03 +00:00 |
|
Ariadne Conill
|
80c46d6d8b
|
nodeinfo: implement MRF transparency exclusions
|
2019-07-13 18:53:14 +00:00 |
|
Ivan Tashkinov
|
b74d11e20a
|
[#1041] Added documentation on existing rate limiters.
|
2019-07-13 15:13:26 +03:00 |
|
Mark Felder
|
360e4cdaa2
|
Move these to pleroma namespace in Mastodon API
|
2019-07-12 11:25:58 -05:00 |
|
Roman Chvanikov
|
eae991b06a
|
merge develop
|
2019-07-12 18:08:27 +03:00 |
|
Alexander Strizhakov
|
846ad9a463
|
admin api configure changes
|
2019-07-11 13:02:13 +00:00 |
|
Egor Kislitsyn
|
182f7bbb11
|
Merge branch 'develop' into feature/addressable-lists
|
2019-07-11 13:26:59 +07:00 |
|
Alex S
|
beba7bbc85
|
removing synchronization worker
|
2019-07-10 17:42:18 +03:00 |
|
Maksim
|
12b1454245
|
[#1062] added option to disable send email
|
2019-07-10 05:34:21 +00:00 |
|
Roman Chvanikov
|
371d39e160
|
Merge develop
|
2019-07-09 21:21:09 +03:00 |
|
feld
|
c91b5c87ff
|
Docs/more mastodon api
|
2019-07-09 18:20:36 +00:00 |
|
Mark Felder
|
9a9b60cfbc
|
Merge branch 'develop' into feature/allow-user-query-via-id
|
2019-07-09 12:49:04 -05:00 |
|
Alexander Strizhakov
|
d6b0fce6e9
|
Fix/1019 correct count remote users
|
2019-07-09 17:36:35 +00:00 |
|
Ivan Tashkinov
|
dd5a41e2a4
|
Apply suggestion to docs/config.md
|
2019-07-09 10:39:36 +00:00 |
|
Maxim Filippov
|
9f23502856
|
Fix docs
|
2019-07-06 15:16:56 +03:00 |
|
Ivan Tashkinov
|
ad8d86e7c6
|
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
|
2019-07-06 10:17:06 +03:00 |
|
Maxim Filippov
|
6c50fbcd14
|
Admin API: Allow querying user by ID
|
2019-07-05 19:33:53 +03:00 |
|
Haelwenn
|
3b05f834f4
|
Merge branch 'fix/docs-dry-run' into 'develop'
OTP Release install docs: Remove --dry-run in cron certbot command
See merge request pleroma/pleroma!1366
|
2019-07-01 04:52:42 +00:00 |
|
Maxim Filippov
|
611f6665ac
|
Update changelog and admin API docs with tags, display_name, avatar additions
|
2019-07-01 03:36:42 +03:00 |
|
Roman Chvanikov
|
d2cb18b2a3
|
Merge branch 'develop' into feature/digest-email
|
2019-06-30 21:23:35 +03:00 |
|
Ivan Tashkinov
|
a799418573
|
[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
# Conflicts:
# CHANGELOG.md
|
2019-06-30 16:05:00 +03:00 |
|
Ivan Tashkinov
|
2b9d914089
|
[#161] Refactoring, documentation.
|
2019-06-30 15:58:50 +03:00 |
|
rinpatch
|
044eb039c2
|
OTP Release install docs: Remove --dry-run in cron certbot command
|
2019-06-30 13:06:10 +03:00 |
|