ffe8459349
Added translation using Weblate (Chinese (Simplified))
2022-07-22 19:00:37 +00:00
3b2bac7a0f
Merge branch 'fix-owncast' into 'develop'
...
Fix owncast
See merge request pleroma/pleroma!3706
2022-07-22 19:00:23 +00:00
eba1666575
AttachmentValidator: fix_media_type/1 fallback to application/octet-stream
2022-07-22 20:30:45 +02:00
09e0304b9c
Add test for broken owncast federation
2022-07-22 20:30:45 +02:00
be98900904
ArticleNotePageValidator: Fix when attachments are a Map (ie. owncast)
2022-07-22 20:30:45 +02:00
c589b8445f
Merge branch 'birthday_fix' into 'develop'
...
Allow to unset birthday
See merge request pleroma/pleroma!3702
2022-07-21 21:27:16 +00:00
454f892f37
Merge branch 'fix/emoji-react-qualification' into 'develop'
...
EmojiReactValidator: fix emoji qualification
See merge request pleroma/pleroma!3684
2022-07-21 17:45:47 +00:00
4350a205a4
Merge remote-tracking branch 'upstream/develop' into HEAD
2022-07-21 13:44:16 -04:00
1f18ab36b5
Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop'
...
Document way to do notice compatibility routes with Nginx reverse-proxy, fixes #2900
Closes #2900
See merge request pleroma/pleroma!3701
2022-07-20 16:57:05 +00:00
fff7571e0d
Merge branch 'fix-cycles' into 'develop'
...
CI: Remove cache on cycles
See merge request pleroma/pleroma!3704
2022-07-20 16:52:15 +00:00
65a5c713e9
CI: Remove cache on cycles
...
cycles uses a different system than the rest of the testing_cache, creating errors like libcrypto.so.1 being missing
2022-07-20 17:49:56 +02:00
3da1b2548d
Actually fix with forward slashes being restricted inside nickname
2022-07-18 21:30:57 -06:00
2c7eed122e
Don't accept forward slash character for nicknames
2022-07-17 12:50:01 -06:00
fb268c4378
Allow to unset birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 19:46:29 +02:00
3193f18cf3
Merge branch 'shrink-ci' into 'develop'
...
Shrink CI
See merge request pleroma/pleroma!3691
2022-07-17 17:34:47 +00:00
bb4860e222
Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop'
...
Translatable config descriptions
Closes pleroma-meta#65
See merge request pleroma/pleroma!3695
2022-07-17 17:34:21 +00:00
64e16e6a4b
Document way to do notice compatibility routes with Nginx reverse-proxy instead
2022-07-16 23:44:37 -06:00
8aba7c08d1
Merge branch 'notification_types' into 'develop'
...
MastoAPI: Use `types` for filtering notifications
See merge request pleroma/pleroma!3648
2022-07-17 03:17:43 +00:00
eb4b7f6efa
Merge branch 'docs__setting_up_a_gitlab_runner' into 'develop'
...
DOCS: Add some small piece about setting up a Gitlab-runner
See merge request pleroma/pleroma!3694
2022-07-17 02:36:28 +00:00
1d7e8d6e01
Pass in msgctxt for config translation strings
2022-07-14 17:41:33 -04:00
3fb9171694
Merge branch 'from/upstream-develop/tusooa/zh-translation' into 'develop'
...
Translate static_pages.po (Simplified Chinese)
See merge request pleroma/pleroma!3655
2022-07-13 23:39:46 +00:00
074a94e90d
Extract translatable strings
2022-07-13 18:57:57 -04:00
7473868880
Fix compile error
2022-07-13 18:46:21 -04:00
20588517fc
Make admin api use translated config descriptions
2022-07-13 18:31:35 -04:00
36f6d92d98
Add tests for translator compiler
2022-07-13 18:31:01 -04:00
b2a0718e83
Extract config descriptions for translation
2022-07-13 18:01:47 -04:00
8ddea16b0d
DOCS: Add some small piece about setting up a Gitlab-runner
...
This is based on me setting one up, but I kept it general with mostly linking to other documentation.
The idea is that to just provide some Pleroma-specific info, maybe give some pointers, and point to the right (external) docs.
2022-07-13 20:54:24 +02:00
fdc71f6051
Merge branch 'short-description' into 'develop'
...
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00
eb2a1652bf
Add tests for short_description
2022-07-13 00:40:46 -04:00
12d888e04e
CI: cycles: Use current stable elixir image
2022-07-12 13:13:24 +02:00
6e158bba2c
CI: template for change policies based on build stage
2022-07-12 12:13:34 +02:00
e574408b33
CI: Run stages when .gitlab-ci.yml changes
2022-07-11 10:15:18 +02:00
702a41ce23
CI: Run lint and cycles in alpine
2022-07-11 10:12:18 +02:00
08c8814ef0
CI: Run postgres services in alpine
2022-07-11 09:29:18 +02:00
311fda32f3
Merge branch 'fix/case-sensitivity-restricted-nicknames-blacklisted-domains' into 'develop'
...
Make checking blacklisted domains and restricted nicknames case-insensitive
Closes #2894 and #2888
See merge request pleroma/pleroma!3687
2022-07-11 04:04:36 +00:00
8bb2e52d2e
Make lint happy
2022-07-10 23:43:49 -04:00
420da14b61
Merge branch 'from/upstream-develop/tusooa/2830-remote-fo-mp' into 'develop'
...
Pass remote follow avatar into media proxy
Closes #2830
See merge request pleroma/pleroma!3690
2022-07-10 16:19:16 +00:00
3cf6c2b7ea
Use is_binary instead of is_bitstring for restricted nicknames tests
2022-07-09 23:39:35 -06:00
2efc0ffcf0
Pass remote follow avatar into media proxy
2022-07-10 00:12:53 -04:00
6e7b919637
Make validation functions for restricted nicknames and blacklisted domains; do restricted nickname validation in LDAP account registration
2022-07-06 20:15:49 -06:00
0d4aceb9b0
Make checking blacklisted domains and restricted nicknames case-insenstive
2022-07-05 20:36:47 -06:00
29f4ab640b
Merge branch 'from/upstream-develop/tusooa/report-too-long' into 'develop'
...
Fix long report notes giving errors on creation
See merge request pleroma/pleroma!3679
2022-07-04 05:21:20 +00:00
8c78fef56f
EmojiReactValidator: apply lanodan's suggestions
...
These changes make the encoding for the fully-qualified heart emoji very visible in editors.
2022-07-04 00:25:54 +00:00
c50ade26ba
Merge branch 'fix/eblurhash-binaries' into 'develop'
...
mix: update eblurhash to 1.2.2
See merge request pleroma/pleroma!3686
2022-07-03 22:02:17 +00:00
eefa981e0a
Merge branch 'indexing-hotspots' into 'develop'
...
Add index hotspots
See merge request pleroma/pleroma!3664
2022-07-03 22:01:37 +00:00
de37583c49
Merge branch 'image_description_from_exif_data' into 'develop'
...
Use EXIF data of image for image description
See merge request pleroma/pleroma!3535
2022-07-03 21:14:25 +00:00
a15b45a589
Merge branch 'bugfix/mime-validation-no-list' into 'develop'
...
Bugfix: Validate mediaType only by it's format
See merge request pleroma/pleroma!3597
2022-07-03 21:04:41 +00:00
6b937d1473
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop'
...
Server announcements (1st pass)
See merge request pleroma/pleroma!3643
2022-07-03 20:58:20 +00:00
c3a0944ce5
mix: update eblurhash to 1.2.2
...
Previous eblurhash versions bundled precompiled binaries which caused
issues on non-Darwin operating systems.
2022-07-02 14:52:28 +02:00
56227ef7ba
Descriptions from exif data with only whitespeces are considered empty
...
I noticed that pictures taken with Ubuntu-Touch have whitespace in one of the fields
This should just be ignored imo
2022-07-01 13:47:23 +02:00
tusooa