aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-0412-97/+139
|\
| * update tests for changes in handle_tags()zotlabs2019-02-031-13/+4
| |
| * fix linkify_tags() so it works with xchans across multiple protocols, also ↵zotlabs2019-02-0311-84/+135
| | | | | | | | some fixes to activity parsing from upstream.
* | update changelogMario Vavti2019-02-031-0/+10
| |
* | cleanup logging and return if query returns empty resultMario Vavti2019-02-031-3/+6
| |
* | do not overwrite $sql_extraMario Vavti2019-02-031-2/+4
| |
* | Merge branch 'core_fixes' into 'dev'M. Dent2019-02-031-0/+1
|\ \ | | | | | | | | | | | | fix #1332 See merge request hubzilla/core!1505
| * | fix #1332Mario Vavti2019-02-021-0/+1
|/ /
* | Merge branch 'patch-20190201a' into 'dev'Mario2019-02-025-6/+41
|\ \ | | | | | | | | | | | | Add filter hooks and the ability to add buttons to the default status editor See merge request hubzilla/core!1502
| * | Add filter hooks and the ability to add buttons to the default status editorDM42.Net (Matt Dent)2019-02-015-6/+41
| | |
* | | Merge branch 'dev' into 'dev'M. Dent2019-02-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Prevent Hubzilla usage for SEO backlinks See merge request hubzilla/core!1501
| * | | Prevent Hubzilla usage for SEO backlinksMax Kostikov2019-02-011-1/+1
| | | |
* | | | Merge branch 'patch-20190130a' into 'dev'Mario2019-02-011-0/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Set lock red and provide warning if a forum is tagged in the post See merge request hubzilla/core!1499
| * | | Set lock red and provide warning if a forum is tagged in the postM. Dent2019-02-011-0/+11
|/ / /
* | | Merge branch 'core_fixes' into 'dev'Max Kostikov2019-01-311-2/+2
|\ \ \ | | | | | | | | | | | | | | | | starring and filing is only supported for post item type See merge request hubzilla/core!1498
| * | | starring and filing is only supported for post item typeMario2019-01-311-2/+2
|/ / /
* | / Merge branch 'dev' into 'dev'Max Kostikov2019-01-312-4/+4
|\| | | |/ |/| | | | | Fix typos in Russian translation See merge request hubzilla/core!1500
| * Update hstrings.phpMax Kostikov2019-01-311-2/+2
| |
| * Update hmessages.poMax Kostikov2019-01-311-2/+2
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-306-198/+312
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-302-0/+39
| |\ \
| * | | clean up whitespace and remove superfluous semicolonMario Vavti2019-01-291-18/+20
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2019-01-291-15/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Custom sessionhandler support, as requested See merge request hubzilla/core!1497
| | * | | Custom sessionhandler support, as requestedMark Nowiasz2019-01-291-15/+35
| | | | |
| * | | | Revert "Make session handler pluggable"Mario2019-01-291-20/+9
| | | | | | | | | | | | | | | This reverts commit 8972ca8134c16039c03ad83d26b75b9e9e21d7ea
| * | | | Revert "fix wrong function name and coding style"Mario2019-01-291-1/+1
| | | | | | | | | | | | | | | This reverts commit 456207b4e75ee4b28b60e90b44ef758dc95b2ebc
| * | | | fix wrong function name and coding styleMario Vavti2019-01-291-1/+1
| | | | |
| * | | | Merge branch 'sessionhandlerhook' into 'dev'Mario2019-01-291-9/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make session handler pluggable See merge request hubzilla/core!1494
| | * | | | Make session handler pluggableDM42.Net (Matt Dent)2019-01-281-9/+20
| | | | | |
| * | | | | Merge branch 'boot' into 'dev'Mario2019-01-291-14/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct variable in boot.php See merge request hubzilla/core!1495
| | * | | | | Correct variable in boot.phpKlaus Weidenbach2019-01-281-14/+12
| | |/ / / /
| * | | | | Merge branch 'doku' into 'dev'Mario2019-01-294-172/+266
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend documentation. See merge request hubzilla/core!1496
| | * | | | | Extend documentation.Klaus Weidenbach2019-01-284-172/+266
| | |/ / / /
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-292-0/+16
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-282-0/+6
| |\ \ \ \ \
* | | | | | | set document title when title changes on a page updatezotlabs2019-01-301-0/+1
| |_|_|_|/ / |/| | | | |
* | | | | | cache embeds in the background on initial storage rather than on first accesszotlabs2019-01-292-0/+39
| |_|/ / / |/| | | |
* | | | | disable hyperdrive in hubzillazotlabs2019-01-281-0/+5
| | | | |
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-2827-1148/+1486
|\| | | |
| * | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-282-1/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | update nginx and lighttpd sample server configs to explicit dissalow access to util See merge request hubzilla/core!1493
| | * | | | update nginx and lighttpd sample server configs to explicit dissalow access ↵Mario Vavti2019-01-272-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | to util
| * | | | | Merge branch 'patch-20190125a' into 'dev'Mario2019-01-271-12/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Remove extraneous sync logic See merge request hubzilla/core!1490
| | * | | | Remove extraneous sync logicM. Dent2019-01-271-12/+2
| |/ / / /
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-271-0/+60
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-261-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | return false if http signatue is not valid See merge request hubzilla/core!1489
| | * | | | return false if http signatue is not validMario Vavti2019-01-251-2/+1
| | | | | |
| * | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-01-252-701/+862
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1491
| | * | | | Update hstrings.phpMax Kostikov2019-01-251-8/+37
| | | | | |
| | * | | | Update hmessages.poMax Kostikov2019-01-251-693/+825
| | | | | |
| * | | | | bump versionMario Vavti2019-01-251-1/+1
| | |/ / / | |/| | |