Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | composer update league/html-to-markdown | Mario | 2021-06-05 | 40 | -672/+837 |
| | |||||
* | composer update smarty | Mario | 2021-06-05 | 13 | -79/+144 |
| | |||||
* | Merge branch 'dev' into six | Mario | 2021-06-05 | 10 | -296/+723 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2021-06-05 | 3 | -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 Runge | 2021-06-05 | 3 | -1/+106 |
| | | | | | | | | | | | | works... | ||||
| * | | Merge branch 'translation-pl' into 'dev' | Mario | 2021-06-05 | 7 | -295/+617 |
| |\ \ | | | | | | | | | | | | | | | | | The Polish translation: ixes and new doc translation See merge request hubzilla/core!1965 | ||||
| | * | | Polish translation: | Andrzej Budziński | 2021-06-04 | 7 | -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 six | Mario | 2021-06-05 | 18 | -1565/+1324 |
|\| | | |||||
| * | | fix es plural return | Mario | 2021-06-04 | 1 | -1/+1 |
| | | | |||||
| * | | changelog | Mario | 2021-06-04 | 1 | -0/+28 |
| | | | |||||
| * | | fix css issue | Mario | 2021-06-04 | 1 | -2/+2 |
| | | | |||||
| * | | Update Spanish | mjfriaza | 2021-06-04 | 2 | -1221/+1687 |
| | | | | | | | | | (cherry picked from commit 993d64801136aa4bde4f4422ae4f07d224a91a62) | ||||
| * | | fix login name label for the case when system.verify_email is disabled | Mario | 2021-06-04 | 1 | -6/+9 |
| | | | | | | | | | (cherry picked from commit e44bf42c646c018e00e8f0a2895a6c29522361a6) | ||||
| * | | fix issue where a deleted channel will return 404 before returning zotinfo | Mario | 2021-06-02 | 4 | -30/+43 |
| | | | | | | | | | (cherry picked from commit 33463152e844f98b933401c394cc0e111893a077) | ||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2021-06-02 | 2 | -1/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Make pubstream ordering configurable See merge request hubzilla/core!1964 | ||||
| | * | | Make pubstream ordering configurable | Max Kostikov | 2021-06-02 | 2 | -1/+2 |
| | | | | |||||
| * | | | fix article summary duplicated when editing - issue #1577 | Mario | 2021-06-02 | 1 | -2/+1 |
| | | | | | | | | | | | | (cherry picked from commit 50c14d353b30d0dcd7c761884d797dc0fe90f777) | ||||
| * | | | fix regression where authors from non zot6, activitypub networks got ↵ | Mario Vavti | 2021-06-02 | 1 | -2/+3 |
| |/ / | | | | | | | | | | | | | dismissed (e.g. relayed diaspora comments) (cherry picked from commit b3df15a3c6e017ce3858ee484c6d2d70a5f18a17) | ||||
| * | | Merge branch 'translation-pl' into 'dev' | Max Kostikov | 2021-05-31 | 14 | -1562/+1292 |
| |\ \ | | | | | | | | | | | | | | | | | New traslations: view/pl/invite* files + some fixes See merge request hubzilla/core!1963 | ||||
| | * | | Fixes to docs/pl/about/about.bb | Andrzej Budziński | 2021-05-31 | 1 | -11/+4 |
| | | | | |||||
| | * | | New traslations: view/pl/invite* files + some fixes | Andrzej Budziński | 2021-05-31 | 13 | -1551/+1288 |
| | | | | |||||
| * | | | fix admin button state not displayed correctly | Mario | 2021-05-31 | 1 | -2/+2 |
| |/ / | | | | | | | (cherry picked from commit baabb3a8730708634385abdb366a45c6e234e154) | ||||
* | | | Update Spanish | mjfriaza | 2021-06-04 | 2 | -1221/+1687 |
| | | | |||||
* | | | use uuid for hash | Mario | 2021-06-04 | 1 | -1/+1 |
| | | | |||||
* | | | fix login name label for the case when system.verify_email is disabled | Mario | 2021-06-04 | 1 | -6/+9 |
| | | | |||||
* | | | Revert "fix login name label for the case when system.verify_email is disabled" | Mario | 2021-06-04 | 2 | -10/+7 |
| | | | | | | | | | | | | This reverts commit d882bad706542eb1e64c24567b8bf112f6cebb89. | ||||
* | | | fix login name label for the case when system.verify_email is disabled | Mario | 2021-06-04 | 2 | -7/+10 |
| | | | |||||
* | | | Merge branch 'six' of https://framagit.org/hubzilla/core into six | Mario Vavti | 2021-06-03 | 5 | -31/+43 |
|\ \ \ | |||||
| * | | | fix issue where a deleted channel will return 404 before returning zotinfo | Mario | 2021-06-02 | 4 | -30/+43 |
| | | | | |||||
| * | | | fix article summary duplicated when editing - issue #1577 | Mario | 2021-06-02 | 1 | -2/+1 |
| | | | | |||||
| * | | | Merge branch 'six' of https://framagit.org/hubzilla/core into six | Mario | 2021-06-02 | 1 | -2/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'dev' into six | Mario | 2021-05-31 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | fix registration bug - issue #1574 | Mario | 2021-05-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | directory improvements | Mario Vavti | 2021-06-03 | 3 | -58/+44 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'six' of https://framagit.org/hubzilla/core into six | Mario Vavti | 2021-06-02 | 4 | -6/+4 |
|\| | | | |||||
| * | | | fix admin button state not displayed correctly | Mario | 2021-05-31 | 1 | -2/+2 |
| | | | | |||||
| * | | | include items.php in boot since it is required almost everywhere | Mario | 2021-05-31 | 1 | -0/+1 |
| | | | | |||||
| * | | | do not overwrite the original rawmsg iconfig that came with the item | Mario | 2021-05-31 | 2 | -4/+1 |
| | | | | |||||
* | | | | fix regression where authors from non zot6, activitypub networks got ↵ | Mario Vavti | 2021-06-02 | 1 | -2/+3 |
|/ / / | | | | | | | | | | dismissed (e.g. relayed diaspora comments) | ||||
* | | | notifier fixes | Mario | 2021-05-29 | 1 | -4/+4 |
| | | | |||||
* | | | fix notifier for non-zot hublocs | Mario | 2021-05-28 | 1 | -1/+1 |
| | | | |||||
* | | | remove masto hack - it does not make sense in threaded view | Mario | 2021-05-28 | 1 | -24/+7 |
| | | | |||||
* | | | remove mod ping | Mario | 2021-05-28 | 1 | -707/+0 |
| | | | |||||
* | | | Merge branch 'dev' into six | Mario | 2021-05-28 | 24 | -10556/+10877 |
|\| | | |||||
| * | | notifications: if we have to return early, make sure to set offset to -1 to ↵ | Mario | 2021-05-28 | 1 | -7/+23 |
| | | | | | | | | | | | | | | | prevent looping (cherry picked from commit f72b8ce30fbbcd672f09eaf9de41e8881ec622ad) | ||||
| * | | Merge branch 'translation-pl' into 'dev' | Max Kostikov | 2021-05-27 | 5 | -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 for | Andrzej Budziński | 2021-05-26 | 5 | -826/+730 |
| |/ / | | | | | | | this translation. | ||||
| * | | Merge branch 'translation-pl' into 'dev' | Max Kostikov | 2021-05-25 | 23 | -10589/+11006 |
| |\ \ | | | | | | | | | | | | | | | | | Updating translatons strings + fixes to Polish translation See merge request hubzilla/core!1961 | ||||
| | * | | Regenerating hstrings.ph file | Andrzej Budziński | 2021-05-24 | 1 | -0/+3664 |
| | | | | |||||
| | * | | Next fixes and generating new hstrings.php file | Andrzej Budziński | 2021-05-24 | 3 | -3686/+23 |
| | | | |