aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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
| * 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.Harald Eilertsen2023-12-172-6/+76
| * | Merge branch 'extend-siteinfo' into 'dev'Mario2023-12-202-0/+22
| |\ \
| | * | Add active addons and blocked sites to siteinfo (html)Harald Eilertsen2023-12-182-0/+22
| |/ /
| * | 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
* | | 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)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 o...Mario Vavti2023-12-081-0/+10
| |/
* | 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.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
| |\|