aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | include items.php in boot since it is required almost everywhereMario2021-05-311-0/+1
| * | | do not overwrite the original rawmsg iconfig that came with the itemMario2021-05-312-4/+1
* | | | fix regression where authors from non zot6, activitypub networks got dismisse...Mario Vavti2021-06-021-2/+3
|/ / /
* | | notifier fixesMario2021-05-291-4/+4
* | | fix notifier for non-zot hublocsMario2021-05-281-1/+1
* | | remove masto hack - it does not make sense in threaded viewMario2021-05-281-24/+7
* | | remove mod pingMario2021-05-281-707/+0
* | | Merge branch 'dev' into sixMario2021-05-2824-10556/+10877
|\| |
| * | notifications: if we have to return early, make sure to set offset to -1 to p...Mario2021-05-281-7/+23
| * | Merge branch 'translation-pl' into 'dev'Max Kostikov2021-05-275-826/+730
| |\ \
| | * | Next fixes. It already looks very nice, but it's not end work yet forAndrzej Budziński2021-05-265-826/+730
| |/ /
| * | Merge branch 'translation-pl' into 'dev'Max Kostikov2021-05-2523-10589/+11006
| |\ \
| | * | Regenerating hstrings.ph fileAndrzej Budziński2021-05-241-0/+3664
| | * | Next fixes and generating new hstrings.php fileAndrzej Budziński2021-05-243-3686/+23