aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | 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
| | * | | Merge branch 'translation-pl' into 'dev'Max Kostikov2021-04-3013-10659/+11672
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Translation update to v.5.7 plus fixes and typos See merge request hubzilla/core!1948
| | | * | Translation update to v.5.7 plus fixes and typosAndrzej Budziński2021-04-3013-10659/+11672
| | |/ /
| | * | Merge branch 'dev' into 'dev'Max Kostikov2021-04-294-19876/+19670
| | |\| | | | | | | | | | | | | | | | | Update Russian translation; fix missprint See merge request hubzilla/core!1947
| | | * Update Russian translationMax Kostikov2021-04-292-19874/+19668
| | | |
| | | * Fix missprintMax Kostikov2021-04-292-2/+2
| | | |
| | | * Merge branch 'dev' into 'dev'Max Kostikov2021-04-2913-1357/+1755
| | | |\ | | | |/ | | |/| | | | | | | | | Dev Sync See merge request kostikov/core!1
| * / | introduce function to remove duplicate singleton hublocsMario2021-05-021-5/+49
| |/ /
| * | bump versionMario2021-04-291-1/+1
| | |
| * | composer dump autoloadMario2021-04-293-2/+10
| | |
| * | version and stringsMario2021-04-292-1126/+1506
| | |
| * | fix typos in Activity::follow()Mario2021-04-291-5/+3
| | |