lain
|
7d542450b1
|
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
|
2020-06-20 09:33:18 +00:00 |
|
Alexander Strizhakov
|
1a704e1f1e
|
fix for packs pagination
|
2020-06-20 10:56:28 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3d4cfc9c5f
|
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
|
2020-06-20 00:08:26 +02:00 |
|
feld
|
f928267773
|
Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
|
2020-06-19 20:38:22 +00:00 |
|
Sergey Suprunenko
|
ac0344dd24
|
Only accounts with Service actor_type are considered as bots
|
2020-06-19 21:19:00 +02:00 |
|
Sergey Suprunenko
|
b63646169d
|
Add support for bot field in update_credentials
|
2020-06-19 21:18:07 +02:00 |
|
lain
|
75670a99e4
|
UpdateValidator: Only allow updates from the user themselves.
|
2020-06-19 16:38:57 +02:00 |
|
lain
|
436bb0cd12
|
Merge branch 'add-troubleshooting-info' into 'develop'
README: Add some troubleshooting info for compilation issues.
See merge request pleroma/pleroma!2660
|
2020-06-19 14:26:43 +00:00 |
|
lain
|
d54b0432ea
|
README: Add some troubleshooting info for compilation issues.
|
2020-06-19 15:49:34 +02:00 |
|
lain
|
cafdf18408
|
Merge branch '1873-pagination-fixes' into 'develop'
[#1873] :offset pagination param support, hashtags pagination
Closes #1873
See merge request pleroma/pleroma!2659
|
2020-06-19 13:42:57 +00:00 |
|
lain
|
372533b7c3
|
Merge branch 'dry-up-follower-update' into 'develop'
User: update_follower_count refactor.
See merge request pleroma/pleroma!2649
|
2020-06-19 13:40:34 +00:00 |
|
lain
|
abdb540d45
|
ObjectValidators: Add basic UpdateValidator.
|
2020-06-19 15:30:30 +02:00 |
|
Ivan Tashkinov
|
5237a2df9f
|
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
|
2020-06-19 16:14:06 +03:00 |
|
lain
|
7e488cd4a7
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
|
2020-06-19 14:56:50 +02:00 |
|
Alexander Strizhakov
|
02ca8a363f
|
default page size for files
|
2020-06-19 14:46:38 +03:00 |
|
Alexander Strizhakov
|
0c739b423a
|
changelog entry
|
2020-06-19 12:31:55 +03:00 |
|
Alexander Strizhakov
|
3e3f9253e6
|
adding overall count for packs and files
|
2020-06-19 10:17:24 +03:00 |
|
Alexander Strizhakov
|
4975ed86bc
|
emoji pagination for pack show action
|
2020-06-18 18:50:03 +03:00 |
|
Alexander Strizhakov
|
3becdafd33
|
emoji packs pagination
|
2020-06-18 14:32:21 +03:00 |
|
Maksim Pechnikov
|
e4c61f1741
|
added test
|
2020-06-18 05:45:15 +03:00 |
|
Maksim Pechnikov
|
c9b5e3feda
|
revert 'database' option to rejected keys
|
2020-06-18 05:29:31 +03:00 |
|
Maksim Pechnikov
|
4044f24e2e
|
fix test
|
2020-06-18 05:06:28 +03:00 |
|
Mark Felder
|
2731ea1334
|
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
|
2020-06-17 13:13:55 -05:00 |
|
Mark Felder
|
c08c9db0c1
|
Remove misleading is_ prefix from boolean function
|
2020-06-17 13:02:01 -05:00 |
|
Mark Felder
|
71a5d9bffb
|
Empty list as default
|
2020-06-17 12:54:02 -05:00 |
|
Mark Felder
|
3462d4b995
|
Merge branch 'develop' into issue/1855
|
2020-06-17 12:50:06 -05:00 |
|
lain
|
d772361e62
|
Merge branch 'fix/1787-mogrify-args' into 'develop'
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
|
2020-06-17 15:53:24 +00:00 |
|
rinpatch
|
43a47bf5cc
|
Merge branch 'fix/notification-type' into 'develop'
Remove `poll` from `notification_type` OpenAPI spec
Closes #1867
See merge request pleroma/pleroma!2657
|
2020-06-17 15:21:42 +00:00 |
|
Egor Kislitsyn
|
d4b5a9730e
|
Remove poll from notification_type OpenAPI spec
|
2020-06-17 18:47:59 +04:00 |
|
Maksim
|
96493da7bd
|
Apply suggestion to test/web/media_proxy/invalidation_test.exs
|
2020-06-17 13:14:01 +00:00 |
|
Maksim
|
9a371bf5f6
|
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
|
2020-06-17 13:12:38 +00:00 |
|
Maksim
|
44ce97a9c9
|
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
|
2020-06-17 13:12:32 +00:00 |
|
Maksim
|
078d687e6e
|
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
|
2020-06-17 12:58:50 +00:00 |
|
Maksim
|
2991aae4c4
|
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
|
2020-06-17 12:58:38 +00:00 |
|
Maksim
|
11b22a4229
|
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
|
2020-06-17 12:58:33 +00:00 |
|
Maksim
|
6d33a3a51b
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
2020-06-17 12:58:28 +00:00 |
|
Maksim
|
793a53f1ec
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
2020-06-17 12:58:16 +00:00 |
|
Maksim
|
1b45bc7b2a
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
2020-06-17 12:58:08 +00:00 |
|
Maksim
|
74fd761637
|
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
|
2020-06-17 12:56:30 +00:00 |
|
Maksim
|
abfb1c756b
|
Apply suggestion to docs/API/admin_api.md
|
2020-06-17 12:56:17 +00:00 |
|
Maksim
|
90613348ed
|
Apply suggestion to docs/API/admin_api.md
|
2020-06-17 12:56:13 +00:00 |
|
rinpatch
|
4ec2fb967e
|
Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
|
2020-06-17 10:34:23 +00:00 |
|
Alexander Strizhakov
|
9a82de219c
|
formatting
|
2020-06-17 10:50:05 +03:00 |
|
Alexander Strizhakov
|
abda3f2d92
|
suggestion for changelog
|
2020-06-17 10:47:20 +03:00 |
|
Alexander Strizhakov
|
a77b0388f4
|
credo fix
|
2020-06-17 10:31:06 +03:00 |
|
Maksim Pechnikov
|
02a5648feb
|
fixed migration the settings to DB
|
2020-06-17 09:15:35 +03:00 |
|
rinpatch
|
bb68f9d27c
|
Merge branch 'release/update-otp-elixir' into 'develop'
Update elixir image used for OTP releases
See merge request pleroma/pleroma!2654
|
2020-06-17 00:00:51 +00:00 |
|
rinpatch
|
281ecd6b30
|
CHANGELOG.md: mention minimal elixir version update
|
2020-06-17 02:30:38 +03:00 |
|
rinpatch
|
55d8263c00
|
Update OTP releases to official images of 1.10.3
This is necessary since we bumped required version of elixir to 1.9.
The dlsym bug should be gone by now.
|
2020-06-17 02:27:28 +03:00 |
|
lain
|
83e5b95102
|
Merge branch 'hotfix/notification-migration' into 'develop'
Chunk the notification type backfill migration
See merge request pleroma/pleroma!2653
|
2020-06-16 21:07:04 +00:00 |
|