aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix merge conflict8.8.4Mario2023-12-201-18/+35
|
* version 8.8.4Mario2023-12-201-1/+1
|
* Merge branch 'dev'Mario2023-12-201-0/+1
|\
| * changelogMario2023-12-201-0/+1
| |
* | Merge branch 'dev'Mario2023-12-206-14/+122
|\|
| * changelogMario2023-12-201-0/+5
| |
| * Revert "changelog"Mario2023-12-206-36/+26
| | | | | | | | This reverts commit 3aefe23184c25c1fc0865313d13902cabfb934d3.
| * changelogMario2023-12-206-26/+36
| |
| * move App::$install check to Config::Load() as suggested by HaraldMario2023-12-201-7/+2
| |
| * Merge branch 'fix-config-deserialization' into 'dev'Mario2023-12-202-6/+76
| |\ | | | | | | | | | | | | Fix deserialization of config values broken by 69266cd6. See merge request hubzilla/core!2077
| | * Fix deserialization of config values broken by 69266cd6.Harald Eilertsen2023-12-172-6/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix issue #1828. This patch makes it explicit that we store arrays in the config as json encoded arrays, while we allow both json encoded and PHP serialized arrays to be deserialized correctly. Unless it's a brand new install, the existing data in the database will be PHP serialized. I've also added a hardening measure in case we fall back to PHP unserialize, making sure we're not vulnerable to a PHP Object Injection attack. This means that deserializing arrays containing PHP objects will no longer work, but afaict we never do that anyways, so I don't think that should break anything.
| * | Merge branch 'extend-siteinfo' into 'dev'Mario2023-12-202-0/+22
| |\ \ | | | | | | | | | | | | | | | | Add active addons and blocked sites to siteinfo (html) See merge request hubzilla/core!2079
| | * | Add active addons and blocked sites to siteinfo (html)Harald Eilertsen2023-12-182-0/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | This adds information about addons activated on the hub, as well as which other sites this hub won't federate with in the HTML version of siteinfo. Based on suggestions by @rockyiii@huby.infozoo.de.
| * | use reqiure_once() - second part of issue #1827Mario2023-12-171-1/+1
| | |
| * | fix loop as described in issue #1827Mario2023-12-171-0/+6
| | |
* | | Revert "check return from Config::Load() and retry on failure plus cleanup"Mario2023-12-171-57/+30
| | | | | | | | | This reverts commit 69266cd6c65d228320dede32a343a9d3f3ea63df
* | | Merge branch 'dev'8.8.3Mario2023-12-171-0/+1
|\| |
| * | changelogMario2023-12-171-0/+1
| | |
* | | Merge branch 'dev'Mario2023-12-172-72/+76
|\| |
| * | Merge branch 'translations-nb_no' into 'dev'Mario2023-12-172-72/+76
| |\ \ | | | | | | | | | | | | | | | | More translations for Norwegian Bokmål (nb_NO) See merge request hubzilla/core!2075
| | * | More translations for Norwegian Bokmål (nb_NO)Harald Eilertsen2023-12-162-72/+76
| | | |
* | | | version 8.8.3Mario2023-12-171-1/+1
| | | |
* | | | Merge branch 'dev'Mario2023-12-171-0/+8
|\| | |
| * | | changelogMario2023-12-171-0/+8
| | |/ | |/|
* | | Merge branch 'dev'Mario2023-12-174-39/+75
|\| |
| * | check return from Config::Load() and retry on failure plus cleanupMario Vavti2023-12-141-30/+57
| |/
| * return if we could not fetch the authorMario Vavti2023-12-141-8/+7
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2023-12-141-1/+1
| |\
| | * typoMario2023-12-131-1/+1
| | |
| * | add the app terms before syncing - otherwise the terms will be reset at the ↵Mario Vavti2023-12-081-0/+10
| |/ | | | | | | other end
* | Merge branch 'dev'Mario Vavti2023-12-081-1/+1
|\|
| * if it is not an array do not attempt count()Mario Vavti2023-12-081-1/+1
| |
* | Merge branch 'dev'8.8.2Mario2023-12-061-1/+1
|\|
| * typoMario2023-12-061-1/+1
| |
* | Merge branch 'dev'Mario2023-12-061-0/+5
|\|
| * changelogMario2023-12-061-0/+5
| |
* | vesrion 8.8.2Mario2023-12-061-1/+1
| |
* | Merge branch 'dev'Mario2023-12-062-2/+5
|\|
| * more issue #1820Mario2023-12-061-0/+1
| |
| * css fixesMario2023-12-041-2/+3
| |
| * require acl_selectors.php - fix issue #1820Mario2023-11-301-0/+1
| |
* | Merge branch 'dev'8.8.1Mario2023-11-271-2/+6
|\|
| * changelogMario2023-11-271-2/+6
| |
* | Merge branch 'dev'Mario2023-11-272-4/+8
|\|
| * Merge branch 'dev' into 'dev'Mario2023-11-272-4/+8
| |\ | | | | | | | | | | | | Update doubleleft.css and doubleright.css according to v.8.8 default.css See merge request hubzilla/core!2074
| | * Update doubleleft.css and doubleright.css according to v.8.8 default.csszlaxy2023-11-272-4/+8
| |/
* | version 8.8.1Mario2023-11-271-1/+1
| |
* | Merge branch '8.8RC'8.8Mario2023-11-25618-16872/+73955
|\ \
| * | version 8.8Mario2023-11-251-1/+1
| | |
| * | Merge branch 'dev' into 8.8RCMario2023-11-251-1/+1
| |\|