Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | remove todo since the zot6 xchan should be merely imported in this case. ↵ | Mario | 2021-05-21 | 1 | -2/+4 | |
| | | | | | | | | | | | | also only return if we already have a result. | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2021-05-21 | 3 | -7/+9 | |
| |\ \ | ||||||
| | * \ | Merge branch 'Malend-dev-patch-02229' into 'dev' | Mario | 2021-05-21 | 1 | -3/+4 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Remove useless test See merge request hubzilla/core!1957 | |||||
| | | * | | Remove useless test | Malendur | 2021-05-20 | 1 | -3/+4 | |
| | | | | | ||||||
| | * | | | Merge branch 'Malend-dev-patch-19605' into 'dev' | Mario | 2021-05-21 | 1 | -2/+2 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix phpDoc See merge request hubzilla/core!1958 | |||||
| | | * | | | Fix phpDoc | Malendur | 2021-05-20 | 1 | -2/+2 | |
| | | |/ / | ||||||
| | * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-05-20 | 1 | -2/+3 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix updated variables in member verificaton template See merge request hubzilla/core!1959 | |||||
| | | * | | | Fix updated variables | Max Kostikov | 2021-05-20 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | introduce the direct flag for direct messages | Mario | 2021-05-21 | 1 | -9/+16 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2021-05-20 | 1 | -2/+2 | |
| |\ \ \ \ | ||||||
| | * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-05-19 | 1 | -2/+2 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix security headers switching See merge request hubzilla/core!1953 | |||||
| | | * | | | Fix security headers switching | Max Kostikov | 2021-05-17 | 1 | -2/+2 | |
| | | |/ / | ||||||
| * | / / | make sure to set the correct item_private state | Mario | 2021-05-20 | 1 | -1/+2 | |
| |/ / / | ||||||
| * / / | bring back the channel_protocols hook | Mario | 2021-05-19 | 1 | -1/+13 | |
| |/ / | ||||||
| * | | there might be errors in cli without this | Mario | 2021-05-17 | 1 | -0/+1 | |
| | | | ||||||
| * | | Ãmake sure we do not deal with diaspora hublocs here | Mario | 2021-05-17 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2021-05-15 | 1 | -5/+48 | |
| |\ \ | ||||||
| | * \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2021-05-15 | 8 | -26/+67 | |
| | |\ \ | ||||||
| | * | | | make sure we do not mess up the query string when removing single parameters | Mario Vavti | 2021-05-15 | 1 | -5/+48 | |
| | | |/ | | |/| | ||||||
| * | | | add zid and delegate parameters to the bdest string so that we will be ↵ | Mario | 2021-05-15 | 1 | -34/+34 | |
| | |/ | |/| | | | | | | | authenticated when being redirected offsite | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2021-05-14 | 6 | -14/+21 | |
| |\ \ | | | | | | | | | | | | | | | | | Random PHP 8 fixes See merge request hubzilla/core!1951 | |||||
| | * | | Random PHP 8 fixes | Max Kostikov | 2021-05-14 | 6 | -14/+21 | |
| | | | | ||||||
| * | | | fix regression in regard to menu wrapping | Mario | 2021-05-12 | 1 | -12/+12 | |
| | | | | ||||||
* | | | | Merge branch 'cherry-pick-a7a47275' into 'master' | Mario | 2021-05-20 | 1 | -2/+3 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' See merge request hubzilla/core!1960 | |||||
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-05-20 | 1 | -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 wrapping | Mario | 2021-05-12 | 1 | -12/+12 | |
| | | | | | | | | | | | | (cherry picked from commit ded9f18b8a36cae8dfe1797b7ba87d7742c996df) | |||||
* | | | | update include/items.php5.6 | Mario | 2021-05-11 | 1 | -8/+1 | |
| | | | | ||||||
* | | | | Merge branch '5.6RC' | Mario | 2021-05-11 | 193 | -11681/+18206 | |
|\ \ \ \ | ||||||
| * | | | | version 5.6 | Mario | 2021-05-11 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch '5.6RC' of https://framagit.org/hubzilla/core into 5.6RC | Mario | 2021-05-11 | 0 | -0/+0 | |
| |\ \ \ \ | ||||||
| | * | | | | id should be intval here | Mario | 2021-05-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | (cherry picked from commit 836de7f1a5a999d5133bc957926ba361e5b6c56e) | |||||
| * | | | | | Merge branch 'dev' into 5.6RC | Mario | 2021-05-11 | 2 | -1/+35 | |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | ||||||
| | * | / | changelog | Mario | 2021-05-11 | 1 | -0/+34 | |
| | | |/ | | |/| | ||||||
| | * | | id should be intval here | Mario | 2021-05-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch '5.6RC' of https://framagit.org/hubzilla/core into 5.6RC | Mario | 2021-05-08 | 0 | -0/+0 | |
| |\ \ \ | ||||||
| | * | | | remove redundant placeholder in query | Mario | 2021-05-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | (cherry picked from commit 954d06bdb7c8ef9f73f799eec72fcbd8bbc56b9f) | |||||
| | * | | | update 1245 to fix hubloc_hash index for postgres | Mario | 2021-05-07 | 3 | -4/+34 | |
| | | | | | | | | | | | | | | | (cherry picked from commit c2e007a8392be62c2698e5519b6d0dc0ec92a92b) | |||||
| | * | | | register: postgres - add default values for timestamps | Mario | 2021-05-07 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | (cherry picked from commit ebd0333256b8209de958085057848b649dbd9283) | |||||
| | * | | | remove logging | Mario | 2021-05-07 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | (cherry picked from commit 2ad6f6e11f1d9eb99b4e7fc36d0bf4a8313d4c3c) | |||||
| * | | | | 5.6RC3 | Mario | 2021-05-08 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'dev' into 5.6RC | Mario | 2021-05-08 | 5 | -10/+39 | |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | ||||||
| | * | | remove redundant placeholder in query | Mario | 2021-05-08 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | update 1245 to fix hubloc_hash index for postgres | Mario | 2021-05-07 | 3 | -4/+34 | |
| | | | | ||||||
| | * | | register: postgres - add default values for timestamps | Mario | 2021-05-07 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | remove logging | Mario | 2021-05-07 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | version 5.6RC2 | Mario | 2021-05-07 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | strings | Mario | 2021-05-07 | 1 | -9012/+8886 | |
| | | | ||||||
| * | | register: implement remove_expired_registrations() and minor fixes | Mario | 2021-05-07 | 5 | -41/+37 | |
| | | | ||||||
| * | | register: fix minor string issue | Mario | 2021-05-07 | 2 | -1/+2 | |
| | | | ||||||
| * | | register: fix language issue and add additional info to the infobox if email ↵ | Mario | 2021-05-07 | 5 | -8/+15 | |
| | | | | | | | | | | | | verification is configured |