lain
|
d0078bc404
|
User Search: Boost resolved results and exact ap_id matches.
|
2020-09-24 15:54:55 +02:00 |
|
rinpatch
|
151df9fc17
|
Merge branch 'fix/test-fix' into 'develop'
Fix for test on mac
See merge request pleroma/pleroma!3027
|
2020-09-24 09:50:39 +00:00 |
|
lain
|
47cd59342f
|
Merge branch 'smol-test' into 'develop'
CommonAPI test: Add test for polls
See merge request pleroma/pleroma!3028
|
2020-09-24 09:41:28 +00:00 |
|
lain
|
35d62a4a56
|
CommonAPI test: Add test for polls
|
2020-09-24 11:12:03 +02:00 |
|
Alexander Strizhakov
|
165961f56d
|
don't run in async mode
|
2020-09-24 12:00:39 +03:00 |
|
Alexander Strizhakov
|
aa1f97a5b6
|
fix for test on mac
|
2020-09-24 10:46:09 +03:00 |
|
Alexander Strizhakov
|
3f201475e0
|
changelog entry
|
2020-09-24 09:54:10 +03:00 |
|
Alexander Strizhakov
|
727a0556a9
|
fix
|
2020-09-24 09:47:23 +03:00 |
|
Alexander Strizhakov
|
5d7ec00bed
|
fixes after rebase
|
2020-09-24 09:42:30 +03:00 |
|
Alexander Strizhakov
|
871fac3e4c
|
docs update
|
2020-09-24 09:41:40 +03:00 |
|
Alexander Strizhakov
|
8c6ec4c111
|
pack routes change
|
2020-09-24 09:16:14 +03:00 |
|
Alexander Strizhakov
|
958008cc14
|
changelog entry
|
2020-09-24 09:12:40 +03:00 |
|
Alexander Strizhakov
|
dbbc801667
|
pagination for remote emoji packs
|
2020-09-24 09:12:39 +03:00 |
|
Alexander Strizhakov
|
9b6d89ff8c
|
support for special chars in pack name
|
2020-09-24 09:12:37 +03:00 |
|
Mark Felder
|
8af8eb5ce7
|
Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
|
2020-09-23 12:32:47 -05:00 |
|
Mark Felder
|
f3a1f9c3bb
|
Merge branch 'develop' into feature/bulk-confirmation
|
2020-09-23 11:56:22 -05:00 |
|
lain
|
e02101e15c
|
Merge branch 'issue/2115' into 'develop'
[#2115] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
|
2020-09-23 12:09:38 +00:00 |
|
lain
|
4dadb7c433
|
Merge branch 'user-query/filter-out-internal' into 'develop'
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
|
2020-09-23 11:51:04 +00:00 |
|
lain
|
436d1a3c41
|
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
|
2020-09-23 11:49:19 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5e86a2809e
|
transmogrifier: Drop incoming create early if it already exists
|
2020-09-23 13:40:45 +02:00 |
|
Roman Chvanikov
|
8f5589cf66
|
Merge develop
|
2020-09-23 13:56:50 +03:00 |
|
lain
|
a5e1c400e4
|
Merge branch 'issue/1975' into 'develop'
[#1975] import emoji from a zip archive
Closes admin-fe#130
See merge request pleroma/pleroma!2911
|
2020-09-23 10:49:29 +00:00 |
|
lain
|
a6c14041c4
|
Merge branch 'develop' into 'issue/1975'
# Conflicts:
# CHANGELOG.md
|
2020-09-23 09:16:00 +00:00 |
|
lain
|
34235bc02a
|
Merge branch 'email-fix-develop' into 'develop'
Allow emails to be sent again (develop)
Closes #2172
See merge request pleroma/pleroma!3025
|
2020-09-23 09:05:52 +00:00 |
|
lain
|
518c0f2962
|
Changelog: Add info about emoji zip import feature
|
2020-09-23 10:57:53 +02:00 |
|
lain
|
9d6415de15
|
Changelog: Info about email fix.
|
2020-09-23 10:54:24 +02:00 |
|
Maksim Pechnikov
|
8e4f043ac7
|
finland-emojis.zip -> emojis.zip
|
2020-09-22 21:58:30 +03:00 |
|
Maksim Pechnikov
|
72d2b34d3b
|
Merge branch 'develop' into issue/1975
|
2020-09-22 21:42:10 +03:00 |
|
Alex Gleason
|
3104367931
|
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
|
2020-09-22 13:37:02 -05:00 |
|
Mark Felder
|
88653c01c9
|
Add test for check_activity_expiration_config/0
|
2020-09-22 11:34:51 -05:00 |
|
Mark Felder
|
7775b1540f
|
Add deprecation warning test for check_hellthread_threshold/0
|
2020-09-22 11:22:15 -05:00 |
|
Mark Felder
|
25bdf0d0d9
|
Add test for welcome message format
|
2020-09-22 11:19:29 -05:00 |
|
Mark Felder
|
e2dcf039d2
|
Fix gun_pool_options deprecation warning message
|
2020-09-22 11:15:40 -05:00 |
|
Mark Felder
|
2fc3b46ee7
|
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
|
2020-09-22 11:13:36 -05:00 |
|
lain
|
df1eb5cf7e
|
Changelog: Add info about chat pagination fix.
|
2020-09-22 17:17:19 +02:00 |
|
lain
|
c95859e45b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
|
2020-09-22 17:13:46 +02:00 |
|
Egor Kislitsyn
|
0e0ece251a
|
Filter out internal users by default
|
2020-09-22 16:56:11 +04:00 |
|
feld
|
02f12ec625
|
Merge branch 'chore/missing-link' into 'develop'
Add FreeBSD and alpha sort
See merge request pleroma/pleroma!3023
|
2020-09-22 12:42:03 +00:00 |
|
Mark Felder
|
3174804f3c
|
Add FreeBSD and alpha sort
|
2020-09-22 07:26:31 -05:00 |
|
lain
|
ee3052a2d8
|
ActivityPub: Return Announces when filtering by following.
|
2020-09-22 14:20:19 +02:00 |
|
Mark Felder
|
e5927e92a6
|
Fix deprecation warning for welcome message
|
2020-09-21 17:08:49 -05:00 |
|
feld
|
d65e6e152a
|
Merge branch 'docs/nginx-config-fedsockets' into 'develop'
Docs/nginx config fedsockets
See merge request pleroma/pleroma!3020
|
2020-09-21 21:52:34 +00:00 |
|
Mark Felder
|
8906f30ba1
|
Use an upstream for reverse proxy so future modifications are simplified
|
2020-09-21 16:19:08 -05:00 |
|
feld
|
637ce939d9
|
Merge branch 'chore/autolinker-rename' into 'develop'
Chase the Autolinker rename from !2677
Closes #2155
See merge request pleroma/pleroma!3019
|
2020-09-21 21:19:02 +00:00 |
|
Mark Felder
|
ade7fede71
|
Most proxy settings can be global
|
2020-09-21 16:13:45 -05:00 |
|
Mark Felder
|
2b553b8f8e
|
Remove duplicate setting
|
2020-09-21 16:11:01 -05:00 |
|
Mark Felder
|
75f6e5e8b7
|
Add FedSockets config
|
2020-09-21 16:10:31 -05:00 |
|
feld
|
a5c34e3123
|
Merge branch 'fix/fedsocket-useragent' into 'develop'
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
|
2020-09-21 21:06:32 +00:00 |
|
Alex Gleason
|
bf181ca968
|
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
|
2020-09-21 16:03:22 -05:00 |
|
Mark Felder
|
7b2bf381e9
|
Chase the Autolinker rename from !2677
|
2020-09-21 16:02:57 -05:00 |
|