Commit graph

262 commits

Author SHA1 Message Date
github-actions[bot]
ba5c859d85 Merge remote-tracking branch 'origin/master' into php8 2022-11-03 18:55:30 +00:00
El RIDO
66600e5eb3
Merge pull request #1003 from PrivateBin/yourls-cleanup
improve configuration wording, adjust self check
2022-11-03 19:54:56 +01:00
El RIDO
987ead2719
ensure the basepath ends in a slash, if one is set 2022-11-03 07:47:50 +01:00
El RIDO
c44b252aa8
Merge branch 'master' into php8 2022-10-29 19:38:01 +02:00
El RIDO
432d3e71d3
improve configuration wording, adjust self check 2022-10-29 07:58:40 +02:00
El RIDO
8ac69590cf
add new Jdenticon comment icon library, set it as default, fixes #793 2022-10-26 06:53:56 +02:00
El RIDO
5b3d61cedc
revert, this one actually was correct 2022-10-25 06:58:42 +02:00
El RIDO
510103fd9f
make tests compatible with newer phpunit 2022-10-25 06:55:24 +02:00
El RIDO
27965d0287
make tests compatible with newer phpunit 2022-10-25 06:53:07 +02:00
El RIDO
8ed9fccf25
make YourlsProxyTest compatible with newer phpunit 2022-10-25 06:43:17 +02:00
El RIDO
522c2721a2
make YourlsProxyTest compatible with newer phpunit 2022-10-25 06:41:42 +02:00
El RIDO
17d7a6967e
make YourlsProxyTest compatible with newer phpunit 2022-10-25 06:39:50 +02:00
El RIDO
f6edcc1acd
Merge branch 'master' into php8 2022-10-25 06:37:15 +02:00
El RIDO
a66f170c5e
PHP 5.6 seems to tolerate an empty string as valid JSON 2022-10-23 13:21:22 +02:00
El RIDO
44f78ffcdf
apply StyleCI recommendations 2022-10-23 13:14:27 +02:00
El RIDO
2776033997
apply StyleCI recommendations 2022-10-23 13:13:12 +02:00
El RIDO
78e915e049
adding tests for YOURLS functionality 2022-10-23 13:09:54 +02:00
El RIDO
2a162d075c
allow unit tests to pass 2022-10-23 09:12:31 +02:00
github-actions[bot]
184b8b567d Merge remote-tracking branch 'origin/master' into php8 2022-03-28 17:03:38 +00:00
El RIDO
6c1f0dde0c
set CSP also as meta tag, to deal with misconfigured webservers mangling the HTTP header 2022-03-13 18:11:13 +01:00
github-actions[bot]
bda1ab23b8 Merge remote-tracking branch 'origin/master' into php8 2022-02-28 18:22:17 +00:00
El RIDO
3e02818335
actually support the short CIDR notation 2022-02-28 16:24:06 +01:00
github-actions[bot]
50fb12e3b3 Merge remote-tracking branch 'origin/master' into php8 2022-02-27 18:33:35 +00:00
El RIDO
d544d5e763
Update tst/Persistence/TrafficLimiterTest.php
Co-authored-by: rugk <rugk+git@posteo.de>
2022-02-26 06:59:11 +01:00
El RIDO
094c96afc6
Update tst/Persistence/TrafficLimiterTest.php
Co-authored-by: rugk <rugk+git@posteo.de>
2022-02-26 06:59:02 +01:00
El RIDO
247992fbca
Update tst/Persistence/TrafficLimiterTest.php
Co-authored-by: rugk <rugk+git@posteo.de>
2022-02-26 06:58:54 +01:00
El RIDO
77153a9b49
Update tst/Persistence/TrafficLimiterTest.php
Co-authored-by: rugk <rugk+git@posteo.de>
2022-02-26 06:58:41 +01:00
El RIDO
1034d4038e
unify IP-related logic into traffic limiter 2022-02-20 11:25:19 +01:00
El RIDO
dbe8debe30
add creator unit tests for refactoring target, currently failing 2022-02-20 09:35:05 +01:00
El RIDO
190a35a53b
small unit test refactoring, comment wording 2022-02-20 09:30:41 +01:00
El RIDO
91041d8c59
simplify/unify naming & wording of the two types of IP lists for the traffic limiter 2022-02-20 09:09:20 +01:00
github-actions[bot]
595f9cf42e Merge remote-tracking branch 'origin/master' into php8 2022-02-18 05:18:21 +00:00
El RIDO
2d7f5e9a9f
allow for Lojban (jbo) to be the "any" language pick
The available language list is generated by reading the i18n directory
descriptor one entry at a time, so if the jbo.json happens to be the first
file written to the directory it will be on top of the list and get picked.

This is an edge case, most users browsers won't be set to that, but we need
to cover this allowed and valid use case in the language detection.
2022-02-17 20:44:49 +01:00
github-actions[bot]
0212429c4a Merge remote-tracking branch 'origin/master' into php8 2022-02-13 07:59:02 +00:00
El RIDO
186dd82653
Apply StyleCI fix
that class name we used was not quite correct, but PHP tolerated the typo
2022-02-12 16:41:25 +01:00
github-actions[bot]
8812b09f5f Merge remote-tracking branch 'origin/master' into php8 2022-01-31 05:41:10 +00:00
El RIDO
585d5db983
apply StyleCI recommendation 2022-01-22 08:47:34 +01:00
El RIDO
2182cdd44f
generalize OCI handling of queries and results 2022-01-22 08:45:12 +01:00
El RIDO
5c61a442a0
phpunit compatibility 2021-10-07 22:36:11 +02:00
El RIDO
9c81d85bb7
phpunit compatibility 2021-10-07 22:34:15 +02:00
El RIDO
168ce1d85c
phpunit compatibility 2021-10-07 22:25:51 +02:00
El RIDO
1f6b962468
phpunit compatibility 2021-10-07 22:24:30 +02:00
El RIDO
1f95f57be9
phpunit compatibility 2021-10-07 22:22:32 +02:00
El RIDO
a2e479192f
phpunit compatibility 2021-10-07 22:20:25 +02:00
El RIDO
3f469f715f
Merge branch 'master' into php8 2021-10-07 22:17:11 +02:00
El RIDO
ae1e4e3edb
clarify use of getDeleteToken() method in unit test 2021-06-16 04:39:24 +02:00
El RIDO
af54e70359
apply StyleCI recommendation 2021-06-14 06:48:46 +02:00
El RIDO
3327645fd4
updated doc blocks, comments, fixed indentations, moved some constant strings 2021-06-14 06:44:30 +02:00
Mark van Holsteijn
b4c75b541b removed json encoding from get/setValue 2021-06-13 21:16:30 +02:00
El RIDO
078c5785dd
fix unit tests on php < 7.3 2021-06-13 12:40:06 +02:00