aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.M.Dent2018-08-105-12/+81
* revert debug comment from the last commitMario Vavti2018-08-091-1/+1
* fix zid leaking to nonzot sites if markdown is enabledMario Vavti2018-08-091-3/+41
* search form action for channel search needs the channel addressMario Vavti2018-08-091-1/+1
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-0923-1718/+8237
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-065-16/+33
| |\
| * | bring some Zot6 libraries and interfaces to red/hubzillazotlabs2018-08-0613-0/+7764
| * | create alter_pdl hookzotlabs2018-08-051-2/+10
| * | ability for addons to create .pdl files and load them automaticallyzotlabs2018-08-041-0/+2
| * | add app_options fieldzotlabs2018-08-027-12/+38
| * | update certszotlabs2018-08-012-1704/+422
| * | hubzilla core issue #1258zotlabs2018-08-011-0/+4
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-302-9/+14
| |\ \
* | | | update install.txtMario Vavti2018-08-081-1/+1
* | | | Merge branch 'patch-15' into 'dev'Mario2018-08-081-3/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add XMLreader in PHP requirementsMax Kostikov2018-08-031-3/+4
|/ / /
* | | Merge branch 'fixactivityorderwithfilters' into 'master'Mario2018-08-021-0/+3
* | | Merge branch 'dev' into 'dev'Mario2018-07-315-16/+33
|\ \ \
| * | | Update Spanish translationManuel Jiménez Friaza2018-07-305-16/+33
| | |/ | |/|
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-312-9/+14
|\| | | |/ |/|
| * Merge branch 'patch-13' into 'dev'Mario2018-07-301-8/+13
| |\
| | * Workaround on possible errorMax Kostikov2018-07-291-5/+6
| | * Update php2po.phpMax Kostikov2018-07-291-2/+3
| | * Workaround on possible errorMax Kostikov2018-07-291-2/+5
| * | Update network.phpgia vec2018-07-301-1/+1
| |/
* | When checking permissions ignore checking site "Block Public" settings in cas...zotlabs2018-07-305-12/+16
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-299-85/+99
|\|
| * fix sql empty query error in db update 1216Mario Vavti2018-07-291-1/+1
| * Merge branch 'patch-12' into 'dev'Mario2018-07-291-9/+15
| |\
| | * Process msgctxt pluralsMax Kostikov2018-07-291-9/+15
| * | versionMario Vavti2018-07-291-1/+1
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-298-84/+92
| |\|
| | * Merge branch 'patch-11' into 'dev'Mario2018-07-281-59/+62
| | |\
| | | * Plural form strings export addedMax Kostikov2018-07-281-59/+62
| | * | Merge branch 'patch-9' into 'dev'Mario2018-07-281-3/+3
| | |\ \
| | | * | Update nav.phpMax Kostikov2018-07-271-3/+3
| | * | | Merge branch 'patch-8' into 'dev'Mario2018-07-281-1/+5
| | |\ \ \
| | | * | | Update Apps.phpMax Kostikov2018-07-271-3/+4
| | | * | | Update Apps.phpMax Kostikov2018-07-271-1/+4
| | | |/ /
| | * | | Merge branch 'patch-7' into 'dev'Mario2018-07-284-20/+21
| | |\ \ \
| | | * | | Update hstrings.phpMax Kostikov2018-07-261-9/+9
| | | * | | Update hmessages.poMax Kostikov2018-07-261-9/+10
| | | * | | Update passchanged_eml.tplMax Kostikov2018-07-261-1/+1
| | | * | | Update lostpass_eml.tplMax Kostikov2018-07-261-1/+1
| | | |/ /
| | * | | Merge branch 'patch-6' into 'dev'Mario2018-07-281-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix duplicate transport displayingkostikov2018-07-251-1/+1
| * | | | wrong class nameMario Vavti2018-07-291-1/+1
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-293-9/+28
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-281-26/+98
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | this may conflictzotlabs2018-07-292-16/+17
| |_|/ / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 13:38:34 +0000