aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* at end of day, some files probably without conflicts so farHilmar R2021-01-2321-4/+243
|
* Merge branch 'master' into air.5Hilmar R2021-01-22514-15785/+36223
|\
| * version 5.2.15.2.1Mario2021-01-161-1/+1
| |
| * changelogMario2021-01-161-0/+6
| | | | | | (cherry picked from commit 485a232ae68617093f58bed6c15a52f80116cdae)
| * wrong logicMario2021-01-161-1/+1
| | | | | | (cherry picked from commit 0d544e2294149efe5f442fa1191c02f241b85b6a)
| * also check for zot6Mario2021-01-161-1/+1
| | | | | | (cherry picked from commit 3bcb3221568d80d3ae8dec47d2416b7c1b091304)
| * make attach_upgrade() catch entries where only display_path is missingMario2021-01-161-2/+1
| | | | | | (cherry picked from commit 42812078c51acb9ffc26cc3cfc52e5048fed16b8)
| * Merge branch '5.2RC'5.2Mario2021-01-13462-12125/+31304
| |\
| | * release 5.2Mario2021-01-131-1/+1
| | |
| | * update changelogMario2021-01-131-1/+1
| | |
| | * Merge branch 'dev' into 5.2RCMario2021-01-132-5/+4
| | |\
| | | * Revert "keyid adapt for backward compatibility to current release part 2"Mario2021-01-131-1/+1
| | | | | | | | | | | | | | | | This reverts commit efb8a29b5fcacd491c5e080572581437b6000f87.
| | | * Revert "keyid adapt for backward compatibility to current release"Mario2021-01-131-4/+3
| | | | | | | | | | | | | | | | This reverts commit ff100a499a2813c1ffa31db04936b04d4b2c8eb4.
| | * | Merge branch 'dev' into 5.2RCMario2021-01-132-1/+7
| | |\|
| | | * do not turn the groups own direkt messages into group items - fixes #1510Mario2021-01-132-1/+7
| | | |
| | * | Merge branch 'dev' into 5.2RCMario2021-01-125-126/+130
| | |\|
| | | * changelogMario2021-01-121-0/+1
| | | |
| | | * lukasreschke/id3parser is not maintained anymore. fix it so that composer ↵Mario2021-01-124-1/+3
| | | | | | | | | | | | | | | | dump-autoload will not complain
| | | * more changelogMario2021-01-121-1/+3
| | | |
| | | * restrict length of short profile title/description to 190characters to omit ↵Mario2021-01-121-125/+125
| | | | | | | | | | | | | | | | sql warnings about too long string data
| | | * Ãupdate changelogMario2021-01-111-0/+44
| | | |
| | * | Ãupdate changelogMario2021-01-111-0/+44
| | | |
| | * | 5.2RC4Mario2021-01-111-1/+1
| | | |
| | * | Merge branch 'dev' into 5.2RCMario2021-01-116-32/+43
| | |\|
| | | * can not access global from statc methodMario2021-01-113-25/+32
| | | |
| | | * missing constant definitionMario Vavti2021-01-101-0/+1
| | | |
| | | * sync_directories() omit known dead sitesMario Vavti2021-01-101-4/+6
| | | |
| | | * undefined variableMario Vavti2021-01-101-2/+2
| | | |
| | | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-01-101-1/+1
| | | |\
| | | | * typoMario Vavti2021-01-091-1/+1
| | | | |
| | | * | missing use statementMario2021-01-101-0/+1
| | | |/
| | | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-01-091-1/+0
| | | |\
| | | | * fix markupMario2021-01-091-1/+0
| | | | |
| | | * | more libzotdirMario2021-01-096-181/+186
| | | |/
| | | * Merge remote-tracking branch 'codeberg/dev' into devMario2021-01-092-2797/+2790
| | | |\
| | | | * Merge pull request 'Update Spanish translation' (#2) from ↵hubzilla2021-01-092-2797/+2790
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mjfriaza/hubzilla:dev into dev Reviewed-on: https://codeberg.org/hubzilla/hubzilla/pulls/2
| | | | | * Update Spanish translationmjfriaza2021-01-082-2797/+2790
| | | | |/
| | | * | update sbomMario2021-01-091-13/+15
| | | | |
| | * | | more libzotdirMario2021-01-116-181/+186
| | | | | | | | | | | | | | | (cherry picked from commit e339e897ff7f856cf5b352f7754f3d1eea240ddb)
| | * | | fix markupMario2021-01-091-1/+0
| | | | | | | | | | | | | | | (cherry picked from commit 4ace4819ff37886b823e94fc250e944eec909501)
| | * | | Update Spanish translationmjfriaza2021-01-092-2797/+2790
| | | | | | | | | | | | | | | (cherry picked from commit c90d1fc8ef383eb471b7bb30b24df15b65bd3b06)
| | * | | update sbomMario2021-01-091-13/+15
| | | | |
| | * | | 5.2RC3Mario2021-01-0910-48/+54
| | |\| |
| | | * | keyid adapt for backward compatibility to current release part 2Mario2021-01-091-1/+1
| | | | |
| | | * | keyid adapt for backward compatibility to current releaseMario2021-01-091-3/+4
| | | | |
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-01-096-17/+17
| | | |\ \
| | | | * | fix some php8 fatal errorsMario2021-01-096-17/+17
| | | | | |
| | | * | | remove redundant mail.apdMario2021-01-092-6/+0
| | | |/ /
| | | * | versionMario2021-01-091-1/+1
| | | | |
| | | * | more streamline keyidMario2021-01-092-5/+5
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 11:18:59 +0000