Commit graph

20948 commits

Author SHA1 Message Date
Benjamin Neff
9dfce77a4d
Remove workaround required to load YAML with ruby 2.7 and 3.1
This works now with ruby >= 3.0
2023-06-12 02:51:41 +02:00
Benjamin Neff
faf9390e70
Add ruby 3.1, drop ruby 2.7 2023-06-12 02:51:16 +02:00
Benjamin Neff
72e1daa5e3
Bump capybara for ruby 3.1
The matrix gem was removed from ruby 3.1, but was required for capybara,
but the current version added it as a dependency.
2023-06-12 02:25:26 +02:00
Benjamin Neff
7934f3e916
Add mail protocol gems
This is required for ruby 3.1 with rails 6.1, as they were removed from
being bundled with ruby 3.1. It can be removed with rails 7 again, as
they were added as a dependency to rails 7.
2023-06-12 02:25:07 +02:00
Benjamin Neff
9cdfd3a55b
Merge pull request #8425 from jhass/8424_fix_yaml_load
Use YAML.unsafe_load_file when available in bundler helper
2023-06-12 01:57:45 +02:00
Jonne Haß
324851eeb5 Use YAML.unsafe_load_file when available in bundler helper
fixes #8424
2023-06-11 12:53:27 +02:00
Dennis Schubert
7ce4309fcb
Merge pull request #8423 from SuperTux88:update-carrierwave-ruby-3
Update carrierwave and add ruby 3.0 support
2023-06-11 03:31:16 +02:00
Benjamin Neff
ae813f0cf2
Enable ruby 3.0 on CI and switch default to 3.0 2023-06-10 20:30:26 +02:00
Benjamin Neff
d790e3dcba
Bump scss_lint and rake
Old rake version didn't work with ruby 3.0 in docker
2023-06-10 19:56:22 +02:00
Benjamin Neff
3c10dbc547
Bump carrierwave 2023-06-10 19:09:53 +02:00
Benjamin Neff
0a545c7092
Merge pull request #8422 from SuperTux88/fix-checkout-deprecation-warning
Upgrade to actions/checkout@v3 to get rid of deprecation warning
2023-06-10 17:27:11 +02:00
Benjamin Neff
02182e3b59
Merge pull request #8421 from SuperTux88/cleanup-from-header-unicode-emojis
Cleanup unicode emojis from email headers
2023-06-10 17:26:48 +02:00
Benjamin Neff
cf49899069
updated 6 locale files [ci skip] 2023-06-10 17:22:19 +02:00
Benjamin Neff
d5a338ad0e
Merge pull request #8420 from SuperTux88/remove-i18n-inflector-rails
Remove i18n-inflector-rails dependency
2023-06-10 17:13:15 +02:00
Benjamin Neff
5ce5cfdecf
Upgrade to actions/checkout@v3 to get rid of deprecation warning 2023-06-10 05:35:31 +02:00
Benjamin Neff
5508401ed8
Don't modify default translations when merging with other language
`deep_merge!` modifies the hash of the default translation, and it looks
like `I18n.t` always returns the same instance, so after that, the
default stays translated. So lets duplicate the hash first, before
modifying it, this also helps because we also add more keys below, which
probably also shouldn't be added to the original.
2023-06-10 05:00:27 +02:00
Benjamin Neff
dc9a18e24d
Cleanup unicode emojis from email headers
Some email providers (for example gmail) block emails if they have
emojis in the from header, as they could be confused with UI elements.
So the easy solution is to just filter all emojis from the name.

The normal `\p{Emoji}` selector also matches normal numbers, because of
the emoji-version of numbers (1️⃣), but the `\p{Emoji_Presentation}` then
doesn't match colored emojis anymore (❄️), so we need a mix of both to
find all emojis
2023-06-09 04:20:15 +02:00
Benjamin Neff
6f802417c6
Remove i18n-inflector-rails dependency
There are no new releases anymore and the current version isn't
compatible with ruby 3.x.

As this feature wasn't really used a lot (Icelandic didn't even setup
inflections properly), it's probably not worth fighting for it, so lets
just drop it.

Related to #8369
2023-06-09 01:13:16 +02:00
Benjamin Neff
87f17fe907
Merge pull request #8418 from SuperTux88/switch-to-cuprite
Switch from apparition to cuprite driver
2023-06-08 22:58:29 +02:00
Benjamin Neff
8ebfd4892f
Merge pull request #8419 from SuperTux88/podman-build
Use podman to build when installed and configured
2023-06-08 22:52:37 +02:00
Benjamin Neff
e7e3d3c326
Use podman to build when installed and configured
I had problems when trying to build with podman with docker-compose 2.x,
but it works when just calling the `podman build` command directly
instead.
2023-06-07 02:46:28 +02:00
Benjamin Neff
bb7e5a369d
Correctly escape username pattern regex
Without the escaping, the backslash doesn't get renderet in the frontend
which leads to some browsers (chrome >= 114?) just allowing every input.
2023-06-05 23:35:31 +02:00
Benjamin Neff
5425f5cfa6
Switch from apparition to cuprite driver
Apparition4 isn't really maintained anymore and there are no new releases
and it always logs a lot of errors, making the output hard to read.

So lets switch to cuprite, as it also supports everything we need and is
still maintained.

Supersedes #8330
2023-06-05 23:34:52 +02:00
Benjamin Neff
ce32a7d16b
Merge pull request #8409 from tclaus/add_app_smart_banner
Add app smart banner to web site when using an iOS device
2023-06-04 21:38:34 +02:00
Benjamin Neff
e29f9e2fa2
Merge pull request #8410 from SuperTux88/allow-DOCKER_HOST-env-var
Allow DOCKER_HOST env var for diaspora-dev docker setup
2023-06-04 21:35:07 +02:00
Benjamin Neff
6510bafa88
Merge pull request #8417 from SuperTux88/remove-strip_exif-flag
Always strip exif data and drop user setting for it
2023-06-04 21:30:01 +02:00
Benjamin Neff
11107ee637
Fix chrome parameters for running jasmine
Yes, I know this is a very ugly workaround, but it works ...

Chrome now requires to add `about:blank` as parameter to open and be
able to use remote debugging. The jasmine-gem isn't supported anymore,
and we need to switch to the `jasmine-browser-runner`, I was working on
that a few months ago, but ran into problems.

As the jasmine-gem doesn't allow to add parameters without `--` infront
of it, lets just add a dummy parameter and add the required
`about:blank` with a space after that. This is ugly, but works for now,
until we can upgrade to the new jasmine version. We could also just
replace the `nil` of the last parameter with that value, but I think
that way it's clearer that this is a workaround and how it works.
2023-06-04 17:10:51 +02:00
Benjamin Neff
763dffa328
Always strip exif data and drop user setting for it
Some imagemagick-versions (I tested Ubuntu 22.04 and debian bullseye)
always loose exif data when converting from jpg to webp. So this made
our CI fail now, but even if it wasn't failing before, some pods always
had and have versions which might loose the information anyway. So
having a setting to keep exif information is kinda pointless, if we
can't guarantee that the information isn't lost. Also, diaspora isn't a
photo sharing platform and we don't display exif information anywhere,
so I think we should just always strip exif data (which was already the
default before), as we don't need them.
2023-06-04 04:25:01 +02:00
Benjamin Neff
f3a6cd9a7f
Use specific registry in Dockerfile
Otherwise podman asks which one to use every time
2022-12-05 01:02:46 +01:00
Benjamin Neff
0c163b8c49
Allow to use different DOCKER_HOST env var
This allows to use rootless podman (which doesn't require sudo) instead
of docker.
2022-12-05 00:53:33 +01:00
Thorsten Claus
83a2274f47 Adding Smart App Banner for insporation on iOS devices 2022-11-17 23:20:35 +01:00
Benjamin Neff
2fe5a7bd40
updated 30 locale files [ci skip] 2022-11-04 02:09:11 +01:00
Benjamin Neff
b0b2083fea
Merge pull request #8407 from Flaburgan/4821-help-mobile
Tell users that there is no help in mobile version, allow to switch to desktop
2022-11-04 02:07:36 +01:00
flaburgan
3d84ae18a7 Tell users that there is no help in mobile version, allow to switch to desktop, fixes #4821 2022-11-02 23:27:58 +01:00
Benjamin Neff
5f6b01e086
Merge pull request #8404 from Flaburgan/8118-scrolling-photos
Do not recreate blueimp each time you're scrolling in the photos page
2022-11-01 21:20:12 +01:00
Benjamin Neff
80c0888176
Merge pull request #8403 from SuperTux88/cleanup-duplicate-pods-for-real-this-time
Cleanup duplicate pods
2022-11-01 21:17:17 +01:00
Benjamin Neff
acc76a383f
Merge pull request #8398 from SuperTux88/fix-mentions-with-underscores
Escape mentions before parsing message with markdown for mobile UI
2022-11-01 21:15:47 +01:00
Dennis Schubert
6af305b2be
Merge pull request #8405 from Flaburgan/7949-feedback-mobile
Add info links (the ones in the footer in the desktop version) into the drawer for mobile
2022-10-31 23:29:42 +01:00
flaburgan
fbc096c7a7 Add info links (the ones in the footer in the desktop version) into the drawer for mobile, fixes #7949 2022-10-31 12:11:46 +01:00
flaburgan
35c254c88c Do not recreate blueimp each time you're scrolling in the photos page, fixes #8118 2022-10-31 11:21:08 +01:00
Benjamin Neff
800f394870
Show ports on pods list
otherwise pods with different ports (or without port) all look the same,
like if they are duplicates
2022-10-31 01:45:13 +01:00
Benjamin Neff
8334eeeeff
Ensure pod urls are always lowercase
otherwise pods can exist multiple times with mixed case
2022-10-31 01:45:13 +01:00
Benjamin Neff
6bdf6f03b4
Cleanup duplicate pods in database
The unique index doesn't work when the port is `NULL`. So use `-1`
instead for when using the default ports (80/443), as if we would use
the real ports, we could still have both 80 and 443 in the database at
the same time.
2022-10-31 01:45:13 +01:00
Benjamin Neff
bfe1b84a2e
Merge pull request #8399 from SuperTux88/docker-pull
Add pull command to diaspora-dev script
2022-10-30 01:46:57 +02:00
Benjamin Neff
f6105e54a9
Merge pull request #8400 from SuperTux88/8352-mobile-photo-url-redirect
Add redirect to mobile-only photo URL when in desktop UI
2022-10-30 01:45:27 +02:00
Benjamin Neff
abcbfcef15
Merge pull request #8397 from SuperTux88/remove-sprockets-es6
Replace sprockets-es6 with babel-transpiler
2022-10-30 01:43:12 +02:00
Benjamin Neff
7e15d9ec8a
Merge pull request #8402 from denschub/cucumber-docker-fixes
Fix running Cucumber in Docker
2022-10-30 01:41:31 +02:00
Benjamin Neff
8b74138e5a
Update postgres and mariadb container to latest major version
This is a breaking change, so dev-databases need to be recreated.
2022-10-30 01:17:11 +02:00
Benjamin Neff
cbbb0a55c2
Add redirect to mobile-only photo URL when in desktop UI
This URL is only used in the mobile UI, but when somebody then copies
the link and sends it to somebody on the desktop UI, they don't see
anything. So lets just redirect to the post containing the photo, so
there is at least something to show.

If there is no linked post, just redirect to the image instead.

Fixes #8352
2022-10-30 00:32:31 +02:00
Dennis Schubert
bd2a45615f
Disable Chromium sandbox for Apparition 2022-10-29 06:30:34 +02:00