github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-08 22:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
20,979 Commits 4 Branches 95 Tags
452f46a548b773b9f31679e9eb68d72a5a2dbea5
Commit Graph

2073 Commits

Author SHA1 Message Date
flaburgan
452f46a548 Add reported user diaspora ID in /report view 
closes #8464
 2025-04-13 18:09:15 +02:00
Dennis Schubert
c24ca7d56c Update open_graph_reader to 0.8.0 
closes #8463
 2025-01-23 22:21:21 +01:00
Benjamin Neff
3fcd5708e9 Revert "Start 1.0.0 cycle (again)" on next-minor 
This reverts commit 094cb73b05.
 2025-01-11 00:47:25 +01:00
Dennis Schubert
b9c36fadfd Add Changelog entry for #8460... 
Nobody saw anything! This commit does not exist!
 2025-01-10 23:31:53 +01:00
Benjamin Neff
094cb73b05 Start 1.0.0 cycle (again) 2024-06-16 02:37:05 +02:00
Benjamin Neff
83a97420d9 Start 0.9.1.0 cycle 2024-06-16 02:35:30 +02:00
Benjamin Neff
94a72e1108 Merge branch 'release/0.9.0.0' 2024-06-16 02:25:33 +02:00
Benjamin Neff
d81aa12d54 Prepare 0.9.0.0 release and replace 1.0 version numbers 2024-06-16 01:45:50 +02:00
Benjamin Neff
70e293ba94 Add rack-attack to throttle login actions 
This also fixes CVE-2024-0227 for 2FA brute force

See: https://blog.inhq.net/posts/totp-CVE-2024-0227/
 2024-06-15 18:32:09 +02:00
Benjamin Neff
0d41b7ca13 Merge pull request #8449 from denschub/blindness 
Replace eye with foreman.
 2024-06-09 03:17:39 +02:00
Benjamin Neff
fddfd8b8c0 Merge pull request #8363 from cmrd-senya/fix-api-tags-stream-to-hide-ignores 
API: update Search endpoint to be aware of ignored users
 2024-06-05 01:06:26 +02:00
Benjamin Neff
c3eaa212af Merge pull request #8406 from Flaburgan/6184-service-disabled 
Do not show the service to the user if it is disabled, fixes #6184

Fixes #6184
 2024-06-05 01:04:00 +02:00
Benjamin Neff
7ec2a68256 Merge pull request #8439 from jhass/feature/comment_likes_api 
add API routes for comment likes
 2024-06-05 01:01:52 +02:00
Benjamin Neff
80beedfe63 Merge pull request #8442 from Flaburgan/mark-like-on-comment-notifications-as-read 
Mark Likes on comment notifications as read when visiting a post
 2024-06-05 01:01:04 +02:00
Benjamin Neff
cc50077188 Merge pull request #8448 from SuperTux88/gem-updates 
Update dependencies and ruby version
 2024-06-05 00:55:00 +02:00
Benjamin Neff
07f6a91d02 Upgrade to ruby 3.3 2024-06-05 00:35:48 +02:00
Benjamin Neff
ae3b7804f0 Merge pull request #8441 from SuperTux88/fix-fetch-comments 
Allow fetching comments
 2024-01-24 01:03:08 +01:00
Benjamin Neff
7cc48bec54 Merge pull request #8285 from Flaburgan/revamped-registrations 
New registration page
 2024-01-24 01:00:11 +01:00
Benjamin Neff
42ffd6322f Merge pull request #8203 from tclaus/2999-likes-comment 
Re-introduce likes on comments
 2023-11-13 02:32:43 +01:00
Benjamin Neff
686f67d2f8 Merge pull request #8035 from Flaburgan/improve-report-form 
Add a more detailed modal when reporting a post or a comment
 2023-11-13 02:31:20 +01:00
Dennis Schubert
bb882daeae Merge branch 'pr8436' into develop 2023-10-16 15:22:50 +02:00
Dennis Schubert
744f5449fb Merge branch 'next-minor' into develop 2023-07-10 01:19:08 +02:00
Dennis Schubert
42b835f0c0 Enforce an ImageMagick policy.xml for all pods. 
This fix was heavily inspired by Mastodon's fix for GHSA-9928-3cp5-93fm.
So, thank you Cure53 for finding this issue, thank you Mozilla for
paying Cure53 to look into it, and thanks for Mastodon for fixing it.
 2023-07-10 01:12:36 +02:00
Benjamin Neff
3b07b16962 Merge pull request #8427 from SuperTux88/gem-updates 
Bump net-* gems and digest
 2023-06-12 05:04:10 +02:00
Benjamin Neff
b34a184b0a Merge pull request #8426 from SuperTux88/add-ruby-3.1 
Add ruby 3.1, drop ruby 2.7
 2023-06-12 04:07:09 +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
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
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
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
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
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
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
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
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
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
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
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
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
Benjamin Neff
6afaa264ee Change next major release to 1.0.0 in the changelog 2022-09-03 02:52:45 +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
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
Benjamin Neff
a661b0b608 Merge branch 'next-minor' into develop 2022-07-24 17:22:41 +02:00