feld
|
6adad96c79
|
Merge branch 'issue/2256' into 'develop'
[#2256] added subject actor to moderation log
See merge request pleroma/pleroma!3164
|
2020-12-04 17:49:05 +00:00 |
|
|
rinpatch
|
1d04bd0894
|
Merge branch 'supported-emojos' into 'develop'
Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186
|
2020-12-03 18:29:42 +00:00 |
|
|
lain
|
fa0d0b602f
|
Emoji: Also accept regional indicators
|
2020-12-03 16:17:39 +01:00 |
|
|
lain
|
8fb259e739
|
Emoji: Only accept RGI emoji.
"recommended for general interchange"
|
2020-12-02 16:46:19 +01:00 |
|
|
lain
|
b6f5e9ac9c
|
Emoji: Remove unused emoji-data.txt
|
2020-12-02 16:15:31 +01:00 |
|
|
lain
|
1adee08321
|
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
|
2020-12-02 16:15:03 +01:00 |
|
|
lain
|
04af0bbe44
|
User: Remove left-over (wrong) fix.
|
2020-12-02 13:39:29 +01:00 |
|
|
lain
|
222312900e
|
User: Don't allow local users in remote changesets
|
2020-12-02 12:18:43 +01:00 |
|
|
Alexander Strizhakov
|
6aadb1cb40
|
digest algorithm is taken from header
|
2020-11-27 08:10:52 +03:00 |
|
|
Maksim Pechnikov
|
fb72f2034a
|
fix spec
|
2020-11-25 22:44:27 +03:00 |
|
|
Mark Felder
|
751712d970
|
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env
e.g., DEBUG=1 mix pleroma.config migrate_from_db
|
2020-11-25 12:52:39 -06:00 |
|
|
Alexander Strizhakov
|
5eef4988bf
|
fix for elixir 1.11
load runtime configs in releases with config provider
|
2020-11-25 14:10:24 +03:00 |
|
|
lain
|
67b15cc033
|
Search: Save detected pg version in a persistent term.
|
2020-11-23 15:29:55 +01:00 |
|
|
lain
|
f9a4cf2097
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
|
2020-11-23 15:18:19 +01:00 |
|
|
feld
|
ecd1ef8cb5
|
Merge branch 'fix/2302-report-duplicates' into 'develop'
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
|
2020-11-20 18:40:15 +00:00 |
|
|
lain
|
e4289792d2
|
Linting.
|
2020-11-20 16:38:05 +01:00 |
|
|
lain
|
9a1e5f5d48
|
Search: Change search method based on detected pg version
|
2020-11-20 16:26:43 +01:00 |
|
|
lain
|
a407e33c78
|
Application: Save postgres version in the environment
|
2020-11-20 16:26:22 +01:00 |
|
|
Alexander Strizhakov
|
0a5b22bc3b
|
start limiters in mix tasks
|
2020-11-20 11:37:01 +03:00 |
|
|
feld
|
79a509ee61
|
Merge branch '2301-users-search-discoverability-fix' into 'develop'
[#2301] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
|
2020-11-19 20:33:52 +00:00 |
|
|
feld
|
cd1b4155d5
|
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
|
2020-11-19 20:32:32 +00:00 |
|
|
Maksim Pechnikov
|
66f411fba0
|
added subject actor to moderation log
|
2020-11-19 22:13:45 +03:00 |
|
|
Ivan Tashkinov
|
b27d8f7437
|
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
# Conflicts:
# CHANGELOG.md
|
2020-11-19 19:35:44 +03:00 |
|
|
lain
|
5e04f4156c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
|
2020-11-19 17:32:57 +01:00 |
|
|
Ivan Tashkinov
|
e164c37139
|
[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.
|
2020-11-19 19:30:02 +03:00 |
|
|
Haelwenn
|
c8d11c3064
|
Merge branch '2317-old-reset-tokens' into 'develop'
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
|
2020-11-19 16:22:14 +00:00 |
|
|
lain
|
8b90d62506
|
Search: Only skip ordering the rum index.
|
2020-11-19 16:29:31 +01:00 |
|
|
lain
|
a60242464e
|
Search: Add option to search with the websearch function
|
2020-11-19 16:12:01 +01:00 |
|
|
Ivan Tashkinov
|
fcad3e716a
|
[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.
|
2020-11-19 18:08:22 +03:00 |
|
|
Alexander Strizhakov
|
46dab37351
|
little fix
|
2020-11-19 15:29:26 +03:00 |
|
|
lain
|
5e2ba57327
|
Activity search: Fix order of results
Greatly speeds up the search for RUM.
|
2020-11-19 13:20:58 +01:00 |
|
|
lain
|
11e0d5f9ac
|
Password Resets: Don't accept tokens above a certain age.
By default, one day
|
2020-11-19 12:27:06 +01:00 |
|
|
Alexander Strizhakov
|
8a8c154b4e
|
test fixes
|
2020-11-19 09:58:32 +03:00 |
|
|
Alexander Strizhakov
|
be0b874e1d
|
fix for mastodon forwarded reports
|
2020-11-19 09:53:14 +03:00 |
|
|
Alexander Strizhakov
|
e2bf6b1f7e
|
fix for forwarded reports
|
2020-11-19 09:53:13 +03:00 |
|
|
minibikini
|
6669ac5bf7
|
Merge branch 'develop' into 'hide-muted-reactions'
# Conflicts:
# CHANGELOG.md
|
2020-11-18 20:22:40 +00:00 |
|
|
feld
|
a1056aace1
|
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
|
2020-11-18 18:57:47 +00:00 |
|
|
lain
|
aae669d05e
|
Merge branch 'fix/webpush-and-emojireact' into 'develop'
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
|
2020-11-18 18:33:48 +00:00 |
|
|
lain
|
6b32e1de23
|
Merge branch 'frontend-admin-api' into 'develop'
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
|
2020-11-18 17:51:57 +00:00 |
|
|
Mark Felder
|
ccddedb504
|
Credo
|
2020-11-17 20:33:30 +00:00 |
|
|
Mark Felder
|
499faa82f6
|
Synchronize reaction notification text with PleromaFE's style
|
2020-11-17 20:22:24 +00:00 |
|
|
Mark Felder
|
5d0bc5e028
|
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
|
2020-11-17 20:21:48 +00:00 |
|
|
Mark Felder
|
67a6abd071
|
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
|
2020-11-17 20:20:00 +00:00 |
|
|
Mark Felder
|
83ec2f1384
|
Allow subscribing for pleroma:emoji_reaction push notifications
|
2020-11-17 20:20:00 +00:00 |
|
|
Mark Felder
|
3ce11b830e
|
Add capability for emoji reaction push notifications
|
2020-11-17 20:20:00 +00:00 |
|
|
lain
|
bb9650f3c2
|
FrontendController: Return error on installation error.
|
2020-11-17 16:43:07 +01:00 |
|
|
Mark Felder
|
97201f7e37
|
Need to start web_resp cache or mix task fails
|
2020-11-17 15:15:53 +00:00 |
|
|
feld
|
d33b9e7b33
|
Merge branch 'remove/fedsockets' into 'develop'
Remove FedSockets
See merge request pleroma/pleroma!3155
|
2020-11-17 14:58:33 +00:00 |
|
|
Egor Kislitsyn
|
f69fe36ebf
|
Merge branch 'develop' into frontend-admin-api
|
2020-11-17 18:34:04 +04:00 |
|
|
Egor Kislitsyn
|
79d2d3f609
|
Merge branch 'develop' into hide-muted-reactions
|
2020-11-17 18:29:52 +04:00 |
|