mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-15 20:07:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,746 Commits 2 Branches 84 Tags
0d463b67bdade2e896b7fa74595950eeaadd55fe
Commit Graph

6746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars Kellogg-Stedman
0d463b67bd Reverse arguments to array_merge of cusotm config (#8033) 
The installer was merging the initial configuration into the custom
configuration, which meant that any keys set in the system configuration
would take precedence over custom configuration. Practically, this meant it
was not possible to preconfigure the database connection via
`config.custom.php`.

This commit reverses the order of the arguments to the `array_merge`
function so that keys in the custom configuration will override keys in the
initial configuration.

See also: https://github.com/FreshRSS/FreshRSS/discussions/8030
 2025-09-29 17:04:45 +02:00
Daniel Scharmach
5e413ef0ce Update German (#8028) 
* Update index.php

"Vorgestern" was technically not correct here, in my opinion:

- "Vorgestern empfangen" implies this is only for the day before yesterday
- "Vor gestern empfangen" would instead include everything before yesterday, too

* Update sub.php

Correction of small typo
 2025-09-29 15:24:28 +02:00
Alexandre Alapetite
5e8c964f6c Stable IDs during SQL import (#7988) 
* Stable IDs during SQL import
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/7949
Make sure that the original category IDs, feed IDs, and label IDs are kept identical during an SQL import.
Avoid breaking everything referring to categories, feeds, labels by their IDs such as searches and third-party extensions.

* Fix export of default category
 2025-09-27 15:11:55 +02:00
Alexandre Alapetite
fdbdd118bf Start 1.27.2-dev 2025-09-27 15:09:53 +02:00
Alexandre Alapetite
3f9b7b3331 Release 1.27.1 1.27.1 2025-09-27 14:51:48 +02:00
Alexandre Alapetite
5532025de2 Changelog 2025-09-27 14:49:57 +02:00
Alexandre Alapetite
3a795eb5db Fix regression in ext.php (#8021) 
fix https://github.com/FreshRSS/Extensions/issues/370
Regression from https://github.com/FreshRSS/FreshRSS/pull/7857
 2025-09-27 14:40:35 +02:00
Inverle
2da733b5cf Dark-pink theme: remove white background from configure buttons (#8020) 
Before:

<img width="273" height="116" alt="image" src="https://github.com/user-attachments/assets/4fb9b1f2-b960-428e-9c3f-84e803cd0afa" />

After:

<img width="239" height="111" alt="image" src="https://github.com/user-attachments/assets/7528649b-47f0-4111-8cf8-ac54080d5573" />
 2025-09-27 14:21:59 +02:00
maTh
e79c2866bd fix: anonym. mode: Do not show config button in sharing menu (#8012) 
* Ref #8001
Do not show the config button in the article sharing menu if it is in the anonym. mode

* Minor whitespace reduction
Because it is a section that is used many times

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
 2025-09-25 23:20:50 +02:00
Inverle
9dd30f03ec Improve restriction of curl params (#8009) 
Rework #7979 
Forgot to change `httpGet()`, which is used in multiple places
 2025-09-25 22:50:21 +02:00
maTh
cec21f231f fix: anonym. mode: label management link (#8011) 
Ref: #8001

Changes proposed in this pull request:

- do not show the "manage" dropdown menu for labels in anonym. mode (normal view)

Before:
<img width="304" height="139" alt="grafik" src="https://github.com/user-attachments/assets/2aff0299-febe-41b0-a99a-450559393cd6" />


After:
<img width="281" height="121" alt="grafik" src="https://github.com/user-attachments/assets/69ad334e-0a31-4546-9939-9b72306db046" />
 2025-09-25 22:47:09 +02:00
Inverle
f8b2b8c415 Prevent logout CSRFs (#7999) 
By avoiding `FreshRSS_Context::initUser()` calls
 2025-09-25 21:52:29 +02:00
maTh
960c6c88a5 Fix: sharing button in top line when 0 entries (#8010) 
ref #8001 

Changes proposed in this pull request:

- count entries, do not show share button when 0 sharing services


How to test the feature manually:
1. having 0 sharing services
2. enable the sharing button in top line (settings -> display>
3. go to normal view -> sharing button should not be displayed in the article entry
4. add 1 sharing service
5. normal view -> sharing button is be displayed
 2025-09-25 21:41:13 +02:00
Inverle
f612a560d2 Fix some CSRFs (#8000) 
In two bookmark actions and one in `entryController`

Completes one TODO from #7923:

de624dc8ce/app/Controllers/entryController.php (L257)

(a POST request is already sent in the frontend)
 2025-09-24 12:13:40 +02:00
Inverle
067479a9f1 Lazy-load <track src> (#7997) 
Follow-up of #7636

I found it's the only missing element that needs to be lazy loaded by putting HTML of https://github.com/cure53/HTTPLeaks/blob/main/leak.html into a feed
 2025-09-23 22:12:44 +02:00
Alexandre Alapetite
87087e4473 Changelog, credits 2025-09-23 21:45:39 +02:00
Alexandre Alapetite
833007f586 Upgrade to PHP_CodeSniffer 4 (#7993) 
https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Version-4.0-User-Upgrade-Guide
A couple of rules have changed name. Exclusion paths have slightly changed behaviour.
Main change is that it was unhappy with our i18n header comments, so minor edit there, since that rule kind of makes sense the rest of the time
 2025-09-22 22:02:59 +02:00
KleinMann
aadbdabd83 add rnkln to credits (#7992) 2025-09-22 19:26:47 +02:00
Alexandre Alapetite
92a73a2c4f Minor forgotten str_starts_with (#7991) 
A couple of places, which have been forgotten when we moved to using `str_starts_with()` instead of `strpos()`.
 2025-09-21 19:06:06 +02:00
beerisgood
f0388f64ac Update German (#7833) 
* Update sub.php

German translation added.

* Update gen.php

German translation added

* make fix-all

* Update conf.php

* make fix-all

* Update index.php

* make fix-all

* Update admin.php

* Update feedback.php

* Update app/i18n/de/index.php

* make fix-all

* Apply suggestions from code review

Co-authored-by: maTh <1645099+math-GH@users.noreply.github.com>

* Update app/i18n/de/index.php

Co-authored-by: maTh <1645099+math-GH@users.noreply.github.com>

* Update app/i18n/de/feedback.php

Co-authored-by: maTh <1645099+math-GH@users.noreply.github.com>

* Icon

* make fix-all

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: maTh <1645099+math-GH@users.noreply.github.com>
Co-authored-by: Alexis Degrugillier <aledeg@users.noreply.github.com>
 2025-09-21 13:45:12 +02:00
Alexandre Alapetite
bc3e4c8fa4 Add option for CSP frame-ancestors (#7857) 
* Add option for CSP frame-ancestors
https://github.com/FreshRSS/FreshRSS/discussions/7856

* Revert contentSelectorPreviewAction

* Same for f.php and api

* Fix double init in f.php

* No sandbox for API page
 2025-09-21 13:29:58 +02:00
Alexandre Alapetite
f1cf57b5b7 Changelog 2025-09-21 13:24:25 +02:00
Inverle
f2c6942a60 Move update one step before (#7989) 
Closes https://github.com/FreshRSS/FreshRSS/issues/7897
 2025-09-21 12:40:40 +02:00
Alexis Degrugillier
caecc5decf fix linkding documentation link (#7985) 
Closes #7984 

Changes proposed in this pull request:

- fix linkding documentation link

How to test the feature manually:

1. add a linkding sharing method
2. click on the documentation link
3. validate that the link is working
 2025-09-20 18:06:55 +02:00
Horváth Zsolt
16c5d84166 Add myself to credits (#7987) 
https://github.com/FreshRSS/FreshRSS/pull/7986
 2025-09-20 13:30:09 +02:00
Horváth Zsolt
508b1bb1ce 6846 i18n update hungarian language (#7986) 
* Update hungarian translation

* Update hungarian translation status as well
 2025-09-20 00:10:26 +02:00
KleinMann
d670bf1e72 Add entry_before_update and entry_before_add hooks (#7977) 
Discussion: https://github.com/FreshRSS/FreshRSS/discussions/7973

Changes proposed in this pull request:

- Add new extension hook "entry_before_add"
- Add new extension hook "entry_before_update"

How to test the feature manually:

1. Create extension that uses the hooks and confirm they are invoked correctly.

Extension to use for testing
https://github.com/rnkln/freshrss-xExtension-Discord/pull/2
 2025-09-18 23:44:17 +02:00
Inverle
055342118f Restrict allowed curl parameters (#7979) 
For additional safety, also making sure in this PR that [`CURLOPT_COOKIEFILE`](https://curl.se/libcurl/c/CURLOPT_COOKIEFILE.html) is only allowed as an empty string during import.
 2025-09-18 23:43:04 +02:00
Alexandre Alapetite
b5ee1d8936 Keep sort and order after marking as read (#7974) 
fix https://github.com/FreshRSS/FreshRSS/issues/7867
 2025-09-17 14:03:00 +02:00
Inverle
25250f46b4 Safer calling of install.php (#7971) 
To prevent `install.php` from being accessed in unintended places
 2025-09-16 00:53:15 +02:00
Alexandre Alapetite
f8310a587c Clarify: Visibility hidden vs. archived (#7970) 
fix https://github.com/FreshRSS/FreshRSS/issues/7887
We have two concepts: how much a feed is shown or not (controlled by priority), and how often a feed is refreshed (or not, in which case it is archived).
This PR removes the wording *Archived* from the *visibility* parameter, since this is not what it does.
 2025-09-15 23:43:46 +02:00
Alexandre Alapetite
ea366d597f Minor RSS output whitespace reduction (#7969) 
fix https://github.com/FreshRSS/FreshRSS/issues/7968
 2025-09-15 22:26:45 +02:00
Inverle
ddb51c0e95 Fix another user self-delete regression (#7877) 
Regression from #7763 
Earlier regression which was fixed before #7626

In addition:
* get rid of `data-toggle` (refactor)
* show invalid login message if deleting account and entered incorrect password instead of redirect to 403
* remove unused reference to `r` parameter
* `forgetOpenCategories()` on login not on any crypto form
 2025-09-15 22:17:14 +02:00
scmaybee
38b7daedf7 i18n zh-CN: Update conf.php (#7944) 
* Update conf.php

Supplementary part of the translation.

* Update app/i18n/zh-cn/conf.php

* Update app/i18n/zh-cn/conf.php

* Update app/i18n/zh-cn/conf.php

* Fixes

---------

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
 2025-09-15 22:12:25 +02:00
Alexandre Alapetite
778d0668e2 Changelog 2025-09-15 22:06:00 +02:00
Alexis Degrugillier
8619ae0779 Bump composer version from 2.5.2 to 2.8.11 (#7966) 
Version 2.5.2 was released Feb 4th, 2023.
Version 2.8.11 was released Aug 21st, 2025.
 2025-09-15 13:40:54 +02:00
Alexandre Alapetite
bb56f59fcf SimplePie merge upstream (#7967) 
* https://github.com/simplepie/simplepie/pull/936 (Normalize encoding uppercase)
 2025-09-15 13:40:14 +02:00
Alexandre Alapetite
29446a29f5 Recovery: skip broken entries during CLI export/import (#7949) 
* Recovery: skip broken entries during CLI export/import
fix https://github.com/FreshRSS/FreshRSS/discussions/7927

```
25605/25605 (48 broken)
```

Help with *database malformed* or other corruption.

* Compatibility multiple databases
 2025-09-14 22:36:01 +02:00
Denys Nykula
b8af8382f0 Add nykula to CREDITS.md (#7964) 
Follow-up to FreshRSS#7961.

Co-authored-by: Alexis Degrugillier <aledeg@users.noreply.github.com>
 2025-09-14 15:36:57 -04:00
Alexandre Alapetite
a7e633bc58 Minor explicit namespace fix for PHPUnit (#7960) 
* Minor explicit namespace fix for PHPUnit
* final
 2025-09-14 21:27:55 +02:00
Inverle
697240813d i18n: add missing string in pl (#7963) 
It was supposed to be done in https://github.com/FreshRSS/FreshRSS/pull/7712#discussion_r2179851787, but that PR hasn't been yet finished for some time now.
 2025-09-14 21:25:21 +02:00
Denys Nykula
6d0bec14e5 Translate to Ukrainian (#7961) 2025-09-14 21:17:30 +02:00
Inverle
7d3102e909 Decrease brightness of nav buttons (#7956) 
Before

<img width="536" height="50" alt="image" src="https://github.com/user-attachments/assets/799fe85b-3141-4f02-b020-ab7b06439ddc" />

After

<img width="510" height="46" alt="image" src="https://github.com/user-attachments/assets/780fa55e-e42b-4c4c-8ba9-32b877cf4ddd" />
 2025-09-13 17:30:46 +02:00
Alexandre Alapetite
b04104fd95 Bump SimplePie to 1.9.0 (#7955) 
Main change is https://github.com/simplepie/simplepie/pull/937 (PHP 8.5: Conditionally call deprecated functions)

P.S. a sync with SimplePie upstream was already done recently, hence the limited changes:
* https://github.com/FreshRSS/FreshRSS/pull/7775
 2025-09-13 00:19:31 +02:00
Inverle
0833591131 Fix JS error when navigating to last article with keyboard (#7957) 
This error would print in the console if navigating to last article with <kbd>J</kbd> or <kbd>K</kbd> key:

<img width="836" height="173" alt="image" src="https://github.com/user-attachments/assets/0ae88d1c-26eb-4ebe-8d15-4bf03c24cef6" />

---

To reproduce the bug:
<ol>
<li>Select unread + read view, while having all articles marked as read</li>
<li>Mark two as unread and go to unread only view</li>
<li>Navigate with either <kbd>J</kbd> or <kbd>K</kbd> until you go past the last article or before first article</li>
<li>See error in console and no navigation with <code>first_feed()</code> or <code>last_feed()</code></li>
</ol>

note: I'm not sure if the fix is what the expected behavior is supposed to be
 2025-09-13 00:15:03 +02:00
Inverle
8a0436ede2 Minor CSS underline fix in label management (#7952) 
Before

<img width="255" height="159" alt="image" src="https://github.com/user-attachments/assets/9b80659c-c646-47de-8436-45aa38afd465" />

After

<img width="238" height="161" alt="image" src="https://github.com/user-attachments/assets/27dcb572-5935-405b-9cfc-33eb95d78bf0" />

(ignore CSS in branch name, it's just HTML changes - although this could've been solved with `display: inline-block` too)
 2025-09-12 08:14:46 +02:00
Alexandre Alapetite
8bd9bd95d8 Minor update syntax echo (#7941) 
* Minor update syntax echo
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/7939

* Fix layout
Whitespace optimisation needed to avoid style glitch
 2025-09-11 21:19:31 +02:00
Alexandre Alapetite
c8da217e87 Docker healthcheck (#7945) 
* Docker healthcheck
fix https://github.com/FreshRSS/FreshRSS/issues/7377

* Use echo for non-CLI error

* curl_close is deprecated

* Connection: close

* Update cli/health.php

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

---------

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
 2025-09-11 09:43:28 +02:00
Bastian Greshake Tzovaras
8e8ff4014d add collection of scraping settings (#7937) 
Closes #7894

Changes proposed in this pull request:

- adds the link to the collection of XPath scraping settings to the appropriate documentation page
 2025-09-11 09:10:30 +02:00
scmaybee
e7c9c3d11e i18n zh-CN: Update index.php (#7943) 
Fixed a translation errors.
 2025-09-11 00:56:25 +02:00