aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | remove redundant placeholder in queryMario2021-05-081-2/+2
| |
* | update 1245 to fix hubloc_hash index for postgresMario2021-05-073-4/+34
| |
* | register: postgres - add default values for timestampsMario2021-05-071-3/+3
| |
* | remove loggingMario2021-05-071-1/+0
| |
* | stringsMario2021-05-071-9012/+8886
| |
* | register: implement remove_expired_registrations() and minor fixesMario2021-05-075-41/+37
| |
* | register: fix minor string issueMario2021-05-072-1/+2
| |
* | register: fix language issue and add additional info to the infobox if email ↵Mario2021-05-075-8/+15
| | | | | | | | verification is configured
* | register: redirect unverified registration emails to the verification formMario2021-05-062-12/+21
| |
* | register: we have already checked for existing email in check_account_email()Mario2021-05-062-33/+14
| |
* | remove duplicate singletons hublocs once a dayMario2021-05-052-0/+4
| |
* | use hubloc_hash instead of hubloc_id_url - otherwise it will bite hublocs ↵Mario2021-05-051-17/+10
| | | | | | | | which use more than one protocol
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-05-053-1634/+1301
|\|
| * Merge branch 'translation-pl' into 'dev'Max Kostikov2021-05-023-1634/+1301
| |\ | | | | | | | | | | | | Fixes related to correction plural expression, plus typos and some other See merge request hubzilla/core!1950
| | * Fixes related to correction plural expression, plus typos and some otherAndrzej Budziński2021-05-013-1636/+1303
| | | | | | | | | fixes
* | | possible minor performance improvementMario2021-05-054-154/+154
|/ /
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-05-0216-30536/+31343
|\ \
| * \ Merge branch 'dev' into 'dev'Max Kostikov2021-04-302-2/+2
| |\ \ | | | | | | | | | | | | | | | | Fix Polish plurals expression See merge request hubzilla/core!1949
| | * | Fix Polish plurals expressionMax Kostikov2021-04-302-2/+2
| | | |
| | * | Merge branch 'dev' into 'dev'Max Kostikov2021-04-3013-10659/+11672
| | |\ \ | | |/ / | |/| | | | | | | | | | Dev sync See merge request kostikov/core!2