aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 works... See merge request hubzilla/core!1952
| | * Changed behavior in the user interaction of the languages selection. Now ↵Hilmar Runge2021-06-053-1/+106
| | | | | | | | | | | | works...
| * | Merge branch 'translation-pl' into 'dev'Mario2021-06-057-295/+617
| |\ \ | | | | | | | | | | | | | | | | The Polish translation: ixes and new doc translation See merge request hubzilla/core!1965
| | * | Polish translation:Andrzej Budziński2021-06-047-295/+617
| |/ / | | | | | | | | | | | | | | | | | | | | | Final fixes in 'view/pl/hmessages.po' + 'docs/pl'. The Polish translation of Habzill's and Zap's GUI is consistent. The most important articles of the documentation are also translated Quality improvements to the documentation remain to be made, including the writing of new articles (guides).
* | | 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
| | | | | | | | | (cherry picked from commit 993d64801136aa4bde4f4422ae4f07d224a91a62)
| * | fix login name label for the case when system.verify_email is disabledMario2021-06-041-6/+9
| | | | | | | | | (cherry picked from commit e44bf42c646c018e00e8f0a2895a6c29522361a6)
| * | fix issue where a deleted channel will return 404 before returning zotinfoMario2021-06-024-30/+43
| | | | | | | | | (cherry picked from commit 33463152e844f98b933401c394cc0e111893a077)
| * | Merge branch 'dev' into 'dev'Mario2021-06-022-1/+2
| |\ \ | | | | | | | | | | | | | | | | Make pubstream ordering configurable See merge request hubzilla/core!1964
| | * | Make pubstream ordering configurableMax Kostikov2021-06-022-1/+2
| | | |
| * | | fix article summary duplicated when editing - issue #1577Mario2021-06-021-2/+1
| | | | | | | | | | | | (cherry picked from commit 50c14d353b30d0dcd7c761884d797dc0fe90f777)
| * | | fix regression where authors from non zot6, activitypub networks got ↵Mario Vavti2021-06-021-2/+3
| |/ / | | | | | | | | | | | | dismissed (e.g. relayed diaspora comments) (cherry picked from commit b3df15a3c6e017ce3858ee484c6d2d70a5f18a17)
| * | Merge branch 'translation-pl' into 'dev'Max Kostikov2021-05-3114-1562/+1292
| |\ \ | | | | | | | | | | | | | | | | New traslations: view/pl/invite* files + some fixes See merge request hubzilla/core!1963
| | * | 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
| |/ / | | | | | | (cherry picked from commit baabb3a8730708634385abdb366a45c6e234e154)
* | | 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
| | | | | | | | | | | | This reverts commit d882bad706542eb1e64c24567b8bf112f6cebb89.
* | | 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 ↵Mario Vavti2021-06-021-2/+3
|/ / / | | | | | | | | | dismissed (e.g. relayed diaspora comments)
* | | 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 ↵Mario2021-05-281-7/+23
| | | | | | | | | | | | | | | prevent looping (cherry picked from commit f72b8ce30fbbcd672f09eaf9de41e8881ec622ad)
| * | Merge branch 'translation-pl' into 'dev'Max Kostikov2021-05-275-826/+730
| |\ \ | | | | | | | | | | | | | | | | Next fixes to Polish translation See merge request hubzilla/core!1962
| | * | Next fixes. It already looks very nice, but it's not end work yet forAndrzej Budziński2021-05-265-826/+730
| |/ / | | | | | | this translation.