aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| | | |
* | | | Merge branch 'cherry-pick-a7a47275' into 'master'Mario2021-05-201-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' See merge request hubzilla/core!1960
| * | | | Merge branch 'dev' into 'dev'Max Kostikov2021-05-201-2/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix updated variables in member verificaton template See merge request hubzilla/core!1959 (cherry picked from commit a7a4727591a884f1dd261d641becc04c11136818) bc2afb21 Fix updated variables
* | | | fix regression in regard to menu wrappingMario2021-05-121-12/+12
| | | | | | | | | | | | (cherry picked from commit ded9f18b8a36cae8dfe1797b7ba87d7742c996df)
* | | | update include/items.php5.6Mario2021-05-111-8/+1
| | | |
* | | | Merge branch '5.6RC'Mario2021-05-11193-11681/+18206
|\ \ \ \
| * | | | version 5.6Mario2021-05-111-1/+1
| | | | |
| * | | | Merge branch '5.6RC' of https://framagit.org/hubzilla/core into 5.6RCMario2021-05-110-0/+0
| |\ \ \ \
| | * | | | id should be intval hereMario2021-05-101-1/+1
| | | | | | | | | | | | | | | | | | (cherry picked from commit 836de7f1a5a999d5133bc957926ba361e5b6c56e)
| * | | | | Merge branch 'dev' into 5.6RCMario2021-05-112-1/+35
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | / changelogMario2021-05-111-0/+34
| | | |/ | | |/|
| | * | id should be intval hereMario2021-05-101-1/+1
| | | |
| * | | Merge branch '5.6RC' of https://framagit.org/hubzilla/core into 5.6RCMario2021-05-080-0/+0
| |\ \ \
| | * | | remove redundant placeholder in queryMario2021-05-081-2/+2
| | | | | | | | | | | | | | | (cherry picked from commit 954d06bdb7c8ef9f73f799eec72fcbd8bbc56b9f)
| | * | | update 1245 to fix hubloc_hash index for postgresMario2021-05-073-4/+34
| | | | | | | | | | | | | | | (cherry picked from commit c2e007a8392be62c2698e5519b6d0dc0ec92a92b)
| | * | | register: postgres - add default values for timestampsMario2021-05-071-3/+3
| | | | | | | | | | | | | | | (cherry picked from commit ebd0333256b8209de958085057848b649dbd9283)
| | * | | remove loggingMario2021-05-071-1/+0
| | | | | | | | | | | | | | | (cherry picked from commit 2ad6f6e11f1d9eb99b4e7fc36d0bf4a8313d4c3c)
| * | | | 5.6RC3Mario2021-05-081-1/+1
| | | | |
| * | | | Merge branch 'dev' into 5.6RCMario2021-05-085-10/+39
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | 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
| | | |
| * | | version 5.6RC2Mario2021-05-071-1/+1
| |/ /
| * | 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