aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-17' into 'master'Mario2018-08-211-1/+2
| | | | | | | | | Add missed app 'Order Apps' See merge request hubzilla/core!1258 (cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7) 6086a70e Add missed app 'Order Apps'
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-166-15/+587
|\
| * missing fileszotlabs2018-08-152-0/+554
| |
| * possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebarzotlabs2018-08-154-15/+33
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-155-5/+48
|\|
| * more backporting for zot6zotlabs2018-08-142-0/+41
| |
| * issue with mdpost addon and archive.org links which contain a full url as a ↵zotlabs2018-08-134-5/+7
| | | | | | | | path/query component
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-1412-67/+149
|\|
| * hubloc DB changes needed for z6zotlabs2018-08-135-2/+44
| |
| * oidc cleanup and discoveryzotlabs2018-08-134-29/+39
| |
| * minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to ↵zotlabs2018-08-134-38/+68
| | | | | | | | 'portable_id', fixed/simplified cgi auth mode
* | Merge branch 'override-helpfiles' into 'dev'Mario2018-08-142-38/+63
|\ \ | | | | | | | | | | | | Override helpfiles See merge request hubzilla/core!1257
| * | Override helpfilesM. Dent2018-08-142-38/+63
|/ /
* | Merge branch 'add-template-overrides' into 'dev'Mario2018-08-133-21/+56
|\ \ | |/ |/| | | | | Add template overrides See merge request hubzilla/core!1256
| * Add support for overriding the default template location and individual ↵M.Dent2018-08-122-13/+45
| | | | | | | | templates via .htconfig.php
| * Fix root not added to internationalized template searchM.Dent2018-08-121-8/+11
| |
* | add table support to markdownzotlabs2018-08-121-2/+79
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-1211-28/+160
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-123-2/+18
| |\
| * \ Merge branch 'oauth2-ui-pr' into 'dev'Mario2018-08-122-9/+33
| |\ \ | | | | | | | | | | | | | | | | Oauth2 ui pr See merge request hubzilla/core!1255
| | * | OAuth2 UI and settings updatesM.Dent2018-08-102-7/+30
| | | |
| | * | Add user_id = local_channel() to the where clause of updatesM.Dent2018-08-101-2/+3
| | | |
| * | | Merge branch 'oauth2' into 'dev'Mario2018-08-125-12/+81
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. See merge request hubzilla/core!1254
| | * | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.M.Dent2018-08-105-12/+81
| | | | |
| * | | | Merge branch 'patch-16' into 'dev'Mario2018-08-121-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Add translation for missed string See merge request hubzilla/core!1253
| | * | | Add translation for missed stringMax Kostikov2018-08-101-1/+1
| |/ / /
| * | | 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
| |\ \ \
| * | | | update install.txtMario Vavti2018-08-081-1/+1
| | | | |
| * | | | Merge branch 'patch-15' into 'dev'Mario2018-08-081-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add XMLreader in PHP requirements See merge request hubzilla/core!1252
| | * | | | Add XMLreader in PHP requirementsMax Kostikov2018-08-031-3/+4
| |/ / / /
* | | | / make channel_remove less memory hungryzotlabs2018-08-121-1/+1
| |_|_|/ |/| | |
* | | | prevent json-ld bombing, turn off browser autocomplete on channel sources ↵zotlabs2018-08-113-2/+18
| |/ / |/| | | | | | | | creation
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-065-16/+33
|\| |
| * | Merge branch 'fixactivityorderwithfilters' into 'master'Mario2018-08-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add GET for filtered forums See merge request hubzilla/core!1251 (cherry picked from commit 4e6539efec70027facb70233254e9b47f8e86c6d) ee1fde42 Add GET for filtered forums
| * | Merge branch 'dev' into 'dev'Mario2018-07-315-16/+33
| |\ \ | | | | | | | | | | | | | | | | Update Spanish translation See merge request hubzilla/core!1249
| | * | 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
| |\| |
* | | | 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
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'patch-13' into 'dev'Mario2018-07-301-8/+13
| |\ \ | | | | | | | | | | | | | | | | Workaround on possible error with php2po See merge request hubzilla/core!1247
| | * | Workaround on possible errorMax Kostikov2018-07-291-5/+6
| | | |
| | * | Update php2po.phpMax Kostikov2018-07-291-2/+3
| | | |