aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'translation-pl' into 'dev'Max Kostikov2021-06-103-74/+74
|\ \ | |/ |/|
| * Polish Translation: a little fixesAndrzej Budziński2021-06-053-3/+3
| * Polish Translation: a little fixesAndrzej Budziński2021-06-053-52/+52
| * Polish translation: some fixesAndrzej Budziński2021-06-053-21/+21
* | remove redundant argMario Vavti2021-06-091-68/+68
* | more work on directory syncMario2021-06-053-21/+3
* | versionMario2021-06-051-1/+1
* | composer update symfony/polyfill-ctypeMario2021-06-055-26/+26
* | composer update psr/logMario2021-06-057-42/+45
* | composer update commerceguys/intl to version 1.1.0Mario2021-06-05266-168/+1055
* | fix testMario2021-06-051-1/+1
* | composer update commerceguys/intlMario2021-06-05205-806/+2621
* | missing use statementMario2021-06-051-0/+1
* | league/html-to-markdown suports tables nowMario2021-06-051-72/+2
* | composer update league/html-to-markdownMario2021-06-0540-672/+837
|/
* composer update smartyMario2021-06-0513-79/+144
* Merge branch 'dev' into sixMario2021-06-0510-296/+723
|\
| * Merge branch 'dev' into 'dev'Mario2021-06-053-1/+106
| |\
| | * Changed behavior in the user interaction of the languages selection. Now work...Hilmar Runge2021-06-053-1/+106
| * | Merge branch 'translation-pl' into 'dev'Mario2021-06-057-295/+617
| |\ \
| | * | Polish translation:Andrzej Budziński2021-06-047-295/+617
| |/ /
* | | Merge branch 'dev' into sixMario2021-06-0518-1565/+1324
|\| |
| * | fix es plural returnMario2021-06-041-1/+1
| * | changelogMario2021-06-041-0/+28
| * | fix css issueMario2021-06-041-2/+2
| * | Update Spanishmjfriaza2021-06-042-1221/+1687
| * | fix login name label for the case when system.verify_email is disabledMario2021-06-041-6/+9
| * | fix issue where a deleted channel will return 404 before returning zotinfoMario2021-06-024-30/+43
| * | Merge branch 'dev' into 'dev'Mario2021-06-022-1/+2
| |\ \
| | * | Make pubstream ordering configurableMax Kostikov2021-06-022-1/+2
| * | | fix article summary duplicated when editing - issue #1577Mario2021-06-021-2/+1
| * | | fix regression where authors from non zot6, activitypub networks got dismisse...Mario Vavti2021-06-021-2/+3
| |/ /
| * | Merge branch 'translation-pl' into 'dev'Max Kostikov2021-05-3114-1562/+1292
| |\ \
| | * | Fixes to docs/pl/about/about.bbAndrzej Budziński2021-05-311-11/+4
| | * | New traslations: view/pl/invite* files + some fixesAndrzej Budziński2021-05-3113-1551/+1288
| * | | fix admin button state not displayed correctlyMario2021-05-311-2/+2
| |/ /
* | | Update Spanishmjfriaza2021-06-042-1221/+1687
* | | use uuid for hashMario2021-06-041-1/+1
* | | fix login name label for the case when system.verify_email is disabledMario2021-06-041-6/+9
* | | Revert "fix login name label for the case when system.verify_email is disabled"Mario2021-06-042-10/+7
* | | fix login name label for the case when system.verify_email is disabledMario2021-06-042-7/+10
* | | Merge branch 'six' of https://framagit.org/hubzilla/core into sixMario Vavti2021-06-035-31/+43
|\ \ \
| * | | fix issue where a deleted channel will return 404 before returning zotinfoMario2021-06-024-30/+43
| * | | fix article summary duplicated when editing - issue #1577Mario2021-06-021-2/+1
| * | | Merge branch 'six' of https://framagit.org/hubzilla/core into sixMario2021-06-021-2/+3
| |\ \ \
| * \ \ \ Merge branch 'dev' into sixMario2021-05-311-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | fix registration bug - issue #1574Mario2021-05-311-1/+1
* | | | | directory improvementsMario Vavti2021-06-033-58/+44
| |_|/ / |/| | |
* | | | Merge branch 'six' of https://framagit.org/hubzilla/core into sixMario Vavti2021-06-024-6/+4
|\| | |
| * | | fix admin button state not displayed correctlyMario2021-05-311-2/+2