aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* 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)
* fix registration bug - issue #1574Mario2021-05-311-1/+1
|
* 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.
* Merge branch 'translation-pl' into 'dev'Max Kostikov2021-05-2523-10589/+11006
|\ | | | | | | | | Updating translatons strings + fixes to Polish translation See merge request hubzilla/core!1961
| * Regenerating hstrings.ph fileAndrzej Budziński2021-05-241-0/+3664
| |
| * Next fixes and generating new hstrings.php fileAndrzej Budziński2021-05-243-3686/+23
| |
| * Updating translation strings (v. 5.7) + fixes to Polish translationAndrzej Budziński2021-05-2322-10487/+10903
|/
* AccessList::is_private() does not return info about the private state (1 or ↵Mario Vavti2021-05-231-4/+4
| | | | 2). Use the info from the parent item until this will be sorted out
* remove todo since the zot6 xchan should be merely imported in this case. ↵Mario2021-05-211-2/+4
| | | | also only return if we already have a result.
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-05-213-7/+9
|\
| * Merge branch 'Malend-dev-patch-02229' into 'dev'Mario2021-05-211-3/+4
| |\ | | | | | | | | | | | | Remove useless test See merge request hubzilla/core!1957
| | * Remove useless testMalendur2021-05-201-3/+4
| | |
| * | Merge branch 'Malend-dev-patch-19605' into 'dev'Mario2021-05-211-2/+2
| |\ \ | | | | | | | | | | | | | | | | Fix phpDoc See merge request hubzilla/core!1958
| | * | Fix phpDocMalendur2021-05-201-2/+2
| | |/
| * | Merge branch 'dev' into 'dev'Max Kostikov2021-05-201-2/+3
| |\ \ | | | | | | | | | | | | | | | | Fix updated variables in member verificaton template See merge request hubzilla/core!1959
| | * | Fix updated variablesMax Kostikov2021-05-201-2/+3
| | | |
* | | | introduce the direct flag for direct messagesMario2021-05-211-9/+16
|/ / /
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-05-201-2/+2
|\ \ \
| * | | Merge branch 'dev' into 'dev'Max Kostikov2021-05-191-2/+2
| |\| | | | | | | | | | | | | | | | | | Fix security headers switching See merge request hubzilla/core!1953
| | * | Fix security headers switchingMax Kostikov2021-05-171-2/+2
| | |/
* | / make sure to set the correct item_private stateMario2021-05-201-1/+2
|/ /
* / bring back the channel_protocols hookMario2021-05-191-1/+13
|/
* there might be errors in cli without thisMario2021-05-171-0/+1
|
* Ãmake sure we do not deal with diaspora hublocs hereMario2021-05-171-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-05-151-5/+48
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2021-05-158-26/+67
| |\
| * | make sure we do not mess up the query string when removing single parametersMario Vavti2021-05-151-5/+48
| | |
* | | add zid and delegate parameters to the bdest string so that we will be ↵Mario2021-05-151-34/+34
| |/ |/| | | | | authenticated when being redirected offsite
* | Merge branch 'dev' into 'dev'Mario2021-05-146-14/+21
|\ \ | | | | | | | | | | | | Random PHP 8 fixes See merge request hubzilla/core!1951
| * | Random PHP 8 fixesMax Kostikov2021-05-146-14/+21
| | |
* | | fix regression in regard to menu wrappingMario2021-05-121-12/+12
| | |
* | | changelogMario2021-05-111-0/+34
| |/ |/|
* | id should be intval hereMario2021-05-101-1/+1
| |