Mutex/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
12498 commits 12 branches 60 tags 294 MiB
Commit graph

12498 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
222312900e User: Don't allow local users in remote changesets 2020-12-02 12:18:43 +01:00
rinpatch
57d0379b89 Merge branch 'fix/search-test-on-exit' into 'develop' 
Search tests: Use on_exit for restoring `persistent_term` state

See merge request pleroma/pleroma!3182
 2020-12-01 17:08:05 +00:00
rinpatch
fc9ebe5073 Search tests: Use on_exit for restoring persistent_term state 
Otherwise if the assertion failed, the code below which resets the
state would never be reached
 2020-12-01 19:45:25 +03:00
Haelwenn
5a5ff508aa Merge branch '2727-gitlab-issues' into 'develop' 
Gitlab-CI: Explicitly tag specified arm32 images.

Closes #2327

See merge request pleroma/pleroma!3178
 2020-11-27 14:20:59 +00:00
lain
6db710c9ba Gitlab-CI: Explicitly tag specified arm32 images. 
So we don't accidentally run generic images on runners
that only can deal with specific images.
 2020-11-27 13:27:35 +01:00
lain
14a2c1da13 Merge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop' 
Digest algorithm is taken from header

Closes #2322

See merge request pleroma/pleroma!3176
 2020-11-27 11:51:24 +00:00
Alexander Strizhakov
6aadb1cb40
digest algorithm is taken from header 2020-11-27 08:10:52 +03:00
rinpatch
bb522bcc44 Merge branch 'removing-fed-sockets-settings' into 'develop' 
Removing remaining fed sockets settings

See merge request pleroma/pleroma!3177
 2020-11-26 15:35:22 +00:00
Alexander Strizhakov
94480c6607
removing fed sockets settings 2020-11-26 17:39:38 +03:00
feld
2b4e355522 Merge branch 'fix/mix-debug' into 'develop' 
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env

See merge request pleroma/pleroma!3175
 2020-11-25 23:59:52 +00: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
rinpatch
7a8be68241 Merge branch 'fix/2323-release-configuration-provider' into 'develop' 
Fix for elixir 1.11

Closes #2323

See merge request pleroma/pleroma!3173
 2020-11-25 11:57:13 +00: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
rinpatch
c2bf67644e Merge branch 'features/ruby-elements' into 'develop' 
scrubbers/default: Add ruby element and it's childs

See merge request pleroma/pleroma!3172
 2020-11-25 08:30:58 +00:00
Haelwenn (lanodan) Monnier
3cfc20083e
scrubbers/default: Add ruby element and it's childs 
This allows to format Japanese furigana (aka ruby) notation.

Present in XHTML 1.1, HTML 5 and later. Absent in XHTML 1.0, HTML 4 and earlier.

See https://www.w3.org/TR/ruby/
 2020-11-25 00:40:21 +01:00
Haelwenn
ddf2314836 Merge branch 'chore/jason-in-tests' into 'develop' 
Use Jason instead of Poison in tests

See merge request pleroma/pleroma!3171
 2020-11-24 12:17:09 +00:00
Mark Felder
54df44d380 Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters 2020-11-23 14:48:14 -06:00
Mark Felder
3283d0805f Use Jason instead of Poison in tests 2020-11-23 13:28:55 -06:00
rinpatch
1ab61953db Merge branch 'chore/bump-linkify' into 'develop' 
[#2293] Update Linkify to 0.3.0

See merge request pleroma/pleroma!3170
 2020-11-23 17:37:27 +00:00
Mark Felder
60c8c5402c Update Linkify to 0.3.0 
Added

- Support returning result as iodata and as safe iodata

Fixed

- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
 2020-11-23 11:22:50 -06:00
rinpatch
12bdced845 Merge branch 'websearch' into 'develop' 
Use `websearch_to_tsvector` by default

See merge request pleroma/pleroma!3163
 2020-11-23 14:40:33 +00: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
Haelwenn
e07f8f8aa5 Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!3167
 2020-11-23 13:43:57 +00:00
Guy Sheffer
d5f5d01495 Translated using Weblate (Hebrew) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/he/
 2020-11-21 18:12:07 +00:00
feld
a65fc78c6a Merge branch 'libmagic' into 'develop' 
Add missing libmagic for image upload to dockerfile

See merge request pleroma/pleroma!3168
 2020-11-21 18:11:58 +00:00
Guy Sheffer
e6af7dc777 Add missing libmagic for image upload 2020-11-21 19:57:38 +02: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
25a03a9b5b Config, Docs: Remove search_function 2020-11-20 16:33:11 +01:00
lain
8532325d65 SearchController Test: Fix test. 2020-11-20 16:29:11 +01:00
lain
cc52f03566 Changelog: Add info about search changes 2020-11-20 16:28:00 +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
lain
d8924e1a56 Merge branch 'fix/mix-tasks' into 'develop' 
Start limiters in mix tasks

Closes #2320

See merge request pleroma/pleroma!3165
 2020-11-20 10:30:02 +00: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
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
rinpatch
6fc38aac88 Merge branch 'fix-rum-search' into 'develop' 
Fix rum search speed

See merge request pleroma/pleroma!3161
 2020-11-19 16:20:59 +00:00
lain
b38c3de411 Gitlab CI: Update postgres 2020-11-19 17:15:05 +01:00
rinpatch
1eda5ab267 CHANGELOG.md: Move rum fix entry to patch section 
Also includes minor cosmetical fixes.
 2020-11-19 19:13:19 +03:00
lain
783fa797bb SearchController Test: Fix test 2020-11-19 16:53:26 +01:00
lain
81b6f02a5e Search Test: linting 2020-11-19 16:48:51 +01:00
lain
8b90d62506 Search: Only skip ordering the rum index. 2020-11-19 16:29:31 +01:00
lain
3b86ad0744 Changelog: Document breaking change. 2020-11-19 16:26:17 +01:00
lain
4a5ab690ef Config: Set search_function to websearch by default 2020-11-19 16:17:14 +01:00