Commit graph

20948 commits

Author SHA1 Message Date
Benjamin Neff
ee593933a1
Add a pull command to update docker images to diaspora-dev script
Before the images were only pulled once and then never updated which
lead to really outdated images and OS dependencies. Now all images
(including the base image for the diaspora container) are pulled when
running `setup`. So the idea is to run the `setup` command from time to
time to bring everything up to date again.
2022-10-06 02:08:02 +02:00
Benjamin Neff
536c96f217
Escape mentions before parsing message with markdown
Usernames that contained underscores were parsed by markdown first. This
broke the diaspora IDs and also added weird html at places where it
wasn't needed. Escaping them before sending the message through the
markdown parser fixes this issue.

As underscores are the only allowed character that can be used for
markdown that is also allowed inside a diaspora ID, this escaping can be
kept pretty simple.

This only fixes it for the mobile UI at the moment, for the desktop UI
it's probably better to fix it in markdown-it.

Related to #7975
2022-10-06 00:45:50 +02:00
Benjamin Neff
185f8a1404
Replace sprockets-es6 with babel-transpiler
Sprockets 4 now has direct babel support, so we can remove the temporary
sprockets-es6 dependency and use babel-transpiler directly.
2022-10-01 02:55:50 +02:00
Benjamin Neff
03796e8fe2
Merge pull request #8395 from denschub/time-travel
Fixes for two date-related spec breakages
2022-09-21 02:47:06 +02:00
Benjamin Neff
57cdc288e2
Merge pull request #8396 from SuperTux88/fix-docker-dev
Fix docker development setup after switch to puma
2022-09-21 02:46:08 +02:00
Benjamin Neff
19b32cf6e3
Merge pull request #8217 from tclaus/7080_multi_select_on_aspects_on_mobile
multi select on aspects on mobile

closes #7080
2022-09-21 02:42:25 +02:00
Dennis Schubert
c47258a873
Don't time travel in check_birthday_spec 2022-09-20 03:20:48 +02:00
Dennis Schubert
6dd8af70f7
Force the dev-docker to always run as amd64
We download a static amd64 browser, so this would explode on arm64, for example.
2022-09-20 00:27:45 +02:00
Benjamin Neff
1358f6fbb8
Expose docker-compose through diaspora-dev script
As the docker-compose.yml contains variables, it can't just be used with
docker-compose directly. So this manually use docker-compose commands
with all the required environment variables set.
2022-09-19 04:01:16 +02:00
Benjamin Neff
a4d45358a2
Set listen not only on localhost when used in docker
When puma was introduced in #8392 the default listen configuration was
set to only localhost, which makes sense for most development setups,
but when run within docker, it needs to listen on all IPs so the port
can be forwarded to be accessable outside of docker.

Because the new default makes sense without docker, I overwrite the
option with a environment variable only in the docker-setup. This also
ensures that it always contains the right value needed for the
docker-setup to work, no matter what was configured outside of docker.
2022-09-19 04:01:16 +02:00
Benjamin Neff
84df8eed33
Add redis to docker development setup
With #8392 the `single_process_mode` was removed, which means that
development now also requires a redis.
2022-09-19 04:01:16 +02:00
Thorsten Claus
65456c7f5e Using mixins for aspects css style 2022-09-12 08:25:37 +02:00
Dennis Schubert
6ddd16267a
Give queue_users_for_removal_spec a bit of allowance to accord for timezone changes 2022-09-10 23:22:34 +02:00
Benjamin Neff
7c450b4446
Merge pull request #8390 from cmrd-senya/improve-public-fetch
Improve public posts fetch on account search
2022-09-10 01:34:54 +02:00
Benjamin Neff
af0b1c55e3
Merge pull request #8389 from SuperTux88/update-changelog
Update next major to 1.0.0
2022-09-10 01:29:10 +02:00
Benjamin Neff
ae4cbb18f7
Merge pull request #8392 from denschub/unicorn-dust
Replace Unicorn with Puma
2022-09-10 01:20:34 +02:00
Benjamin Neff
1c72dcc412
Merge branch 'next-minor' into develop 2022-09-10 01:16:09 +02:00
Benjamin Neff
52f206fa8a
Merge branch 'hotfix/0.7.18.1' 2022-09-10 01:13:25 +02:00
Dennis Schubert
9075dfa470
Update binstubs
Newly generated binstubs will check for the string
`This file was generated by Bundler` inside `bin/bundle`, so we'd have
to update that anyway.

Also, there is a non-zero chance the updated `bundle` binstub resolves
some of the setup-specific issues we've seen.
2022-09-10 00:43:20 +02:00
Dennis Schubert
97cfc80a1f
Replace Unicorn with Puma
… and drop the single_process_mode. See the included Changelog entry
for full details on what this change means.
2022-09-09 04:33:37 +02:00
Dennis Schubert
bb80ca3394
Remove artifacts from the old Federation integration testing attempt
It's… safe to assume that nobody is using this, as this has been broken
for quite some time.
2022-09-07 03:17:03 +02:00
Dennis Schubert
bfd42a1914
Update binstubs
Newly generated binstubs will check for the string
`This file was generated by Bundler` inside `bin/bundle`, so we'd have
to update that anyway.

Also, there is a non-zero chance the updated `bundle` binstub resolves
some of the setup-specific issues we've seen.
2022-09-07 03:15:39 +02:00
cmrd Senya
e77d785d9c post fetch: update spec to test reshares data too 2022-09-06 10:22:08 +03:00
cmrd Senya
61d7eb100a post fetch: use warn not debug for exception logging 2022-09-05 23:22:26 +03:00
cmrd Senya
a6e7c8e2d5 post fetch: update post fetch spec 2022-09-05 23:19:11 +03:00
cmrd Senya
f3c01d5a46 post fetch: remove check for type to allow fetching reshares 2022-09-04 23:28:43 +03:00
cmrd Senya
93d61c7f21 Use federation code for fetching public posts on search 2022-09-04 23:15:30 +03:00
Benjamin Neff
66a0994c91
Change development version number to 1.0.0-dev
Lets use the `-dev` suffix for future development versions.
2022-09-04 19:11:25 +02:00
Benjamin Neff
8a249c06c7
Change deprecation warning for diaspora.yml to version 2.0
as this will be the next major after 1.0
2022-09-03 02:56:46 +02:00
Benjamin Neff
6afaa264ee
Change next major release to 1.0.0 in the changelog 2022-09-03 02:52:45 +02:00
Thorsten Claus
8e01a66cb5 Finishing Touches 2022-09-01 22:49:48 +02:00
Benjamin Neff
1c064e016f
Merge pull request #8387 from denschub/linked-inline-code-color
Make inline code inside links show the link color.
2022-08-31 22:40:49 +02:00
Benjamin Neff
d18243b5cf
Merge pull request #8385 from SuperTux88/remove-therubyracer
Remove note about therubyracer from Gemfile
2022-08-31 22:38:25 +02:00
Sébastien Adam
71c856e330 #7080: SCSS adaptation for displaying the selection of the aspect selection button 2022-08-30 22:55:52 +02:00
Sébastien Adam
fa39f7d348 #7080 Adaptation of the JS for the behavior of the aspect selection button. 2022-08-30 22:51:18 +02:00
Sébastien Adam
29fa1e582a #7080 using aspect selecting button form html into mobile version 2022-08-30 22:51:18 +02:00
Dennis Schubert
0ede0233df
Make inline code inside links show the link color.
Fixes #8386
2022-08-26 20:24:32 +02:00
Benjamin Neff
6687f85164
Remove note about therubyracer from Gemfile
podmins should just install nodejs instead
2022-08-24 02:52:16 +02:00
Benjamin Neff
58483bdd2c
Merge branch 'next-minor' into develop 2022-07-31 23:14:32 +02:00
Benjamin Neff
9485a02639
Merge branch 'next-minor' 2022-07-31 23:12:00 +02:00
Benjamin Neff
eaedd3d26c
updated 11 locale files [ci skip] 2022-07-31 23:08:59 +02:00
Benjamin Neff
77af1b9942
Merge pull request #8383 from tclaus/show_available_pods
Prepare the backend for generating a list of active pods
2022-07-31 04:12:02 +02:00
Thorsten Claus
416c806012 Adding total and active count to pod view
The backend adds the total count for all pods, as well as the count for active pods.

In the frontend shows the new counts but without any further user interactions
2022-07-31 00:19:41 +02:00
Benjamin Neff
496ec4b059
Merge branch 'next-minor' into develop 2022-07-24 21:09:52 +02:00
Benjamin Neff
65909700f3
Merge pull request #8384 from SuperTux88/downgrade-bundler-next-minor
Downgrade Gemfile.lock to bundler 2.1.4
2022-07-24 21:08:14 +02:00
Benjamin Neff
586b319c79
Downgrade Gemfile.lock to bundler 2.1.4
This is the default bundler version that comes with ruby 2.7, and it
looks like ruby ruby 2.7 and bundler 2.3.18 have a problem with the new
splitted version where each gem source has it's own block and it
crashes.

To have less problems for podmins when updating, lets just downgrade
bundler and use the old lockfile format in next-minor. It's not a
problem anymore in develop as we don't have rails-assets anymore there,
as we switched to yarn.
2022-07-24 20:50:01 +02:00
Benjamin Neff
a661b0b608
Merge branch 'next-minor' into develop 2022-07-24 17:22:41 +02:00
Benjamin Neff
646685b42c
Handle Faraday::ServerError (for example 502) as HTTPFailure
closes #8380
2022-07-24 17:20:21 +02:00
Benjamin Neff
78b28c3d54
Handle nodeinfo timeouts gracefully
some (especially bigger pods) are sometimes slow to respond with
statistics, so lets handle that gracefully and not mark the pods as
down.
2022-07-24 17:19:04 +02:00
Benjamin Neff
b29675fead
Remove error if there was no error anymore
also add pod uri when logging offline pods ... just having a bunch of
"OFFLINE" log messages doesn't help at all.
2022-07-24 17:17:51 +02:00