aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-20181028a' into 'dev'Mario2018-11-056-20/+157
|\
| * strpos needs to test with ===0 not ==0M.Dent2018-11-011-3/+3
| * Add tracking of deleted pconfig variablesM.Dent2018-10-291-4/+40
| * Fix to set update time in pconfig on updateM.Dent2018-10-281-3/+3
| * Add timestamp and associated logic to pconfigM.Dent2018-10-283-16/+90
| * DB Updates to prep for pconfig timestamps.M.Dent2018-10-283-1/+28
* | update changelog and bump versionMario Vavti2018-11-052-1/+15
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-053-129/+319
|\ \
| * | debug zot6 discoveryzotlabs2018-11-041-118/+283
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-045-8/+13
| |\ \
| * | | z6 updates to owa, linkinfo improved image detectionzotlabs2018-11-042-11/+36
* | | | Merge branch 'dev' into 'dev'Mario2018-11-052-2/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | more fixes for forum notifications handling: do not count likes/dislikes if l...Mario Vavti2018-11-032-2/+6
* | | | Merge branch 'dev' into 'dev'Mario2018-11-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed typo at view/es-es/hstrings.phpManuel Jiménez Friaza2018-11-031-1/+1
|/ / /
* | | Merge branch 'patch-3' into 'dev'Mario2018-11-031-3/+3
|\ \ \
| * | | Update hmessages.pogia vec2018-11-021-3/+3
* | | | Merge branch 'patch-2' into 'dev'Mario2018-11-031-1/+1
|\ \ \ \
| * | | | Update hstrings.phpgia vec2018-11-021-1/+1
| |/ / /
* | | | Merge branch 'patch-22' into 'dev'Mario2018-11-031-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Update Linkinfo.phpMax Kostikov2018-11-031-1/+1
| * | | Update Linkinfo.phpMax Kostikov2018-11-031-1/+1
| * | | Update Linkinfo.phpMax Kostikov2018-11-031-4/+4
| * | | Update Linkinfo.phpMax Kostikov2018-11-021-2/+2
| * | | more precise codepage detectionMax Kostikov2018-11-021-3/+5
| * | | Workaround for incorrect ISO-8859-5 encoded content conversionMax Kostikov2018-11-021-2/+5
|/ / /
* | | Merge branch 'patch-21' into 'dev'Mario2018-11-021-2/+2
|\ \ \ | |/ / |/| |
| * | Fix wrong image resize for some external imagesMax Kostikov2018-11-011-2/+2
|/ /
* | css fix for reshared-content images and whitespaceMario Vavti2018-10-311-3/+14
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-311-1/+6
|\ \
| * \ Merge branch 'patch-20' into 'dev'Mario2018-10-311-1/+6
| |\ \
| | * | Update oembed.phpMax Kostikov2018-10-301-1/+5
| | * | Beautiful embedding for Hubzilla linksMax Kostikov2018-10-301-1/+2
* | | | yet another blueimp vulnerability. Move to composer.Mike Macgirvin2018-10-3167-63/+509
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-10-30247-5650/+6481
|\| | |
| * | | Merge branch 'composer-updates' into 'dev'M. Dent2018-10-31239-5188/+5913
| |\ \ \
| | * | | fix another markdown testMario Vavti2018-10-301-1/+1
| | * | | fix markdown testsMario Vavti2018-10-302-13/+8
| | * | | really fix html2markdown() - when using environment, we must set the defaultsMario Vavti2018-10-301-5/+13
| | * | | fix html2markdown() and re-enable previously failing testsMario Vavti2018-10-302-13/+6
| | * | | update html_to_markdown, smarty and sabredav libs via composerMario Vavti2018-10-30237-5162/+5891
| | |/ /
| * | | Merge branch 'forum-ping' into 'dev'M. Dent2018-10-311-4/+3
| |\ \ \
| | * | | fix forum ping results - the term query requires xchan_name instead of xchan_...Mario Vavti2018-10-291-4/+3
| | |/ /
| * | | Merge branch 'wikilist-widget' into 'dev'M. Dent2018-10-312-5/+0
| |\ \ \ | | |/ / | |/| |
| | * | allow wiki_list widget to be used in any pageMario Vavti2018-10-292-5/+0
| |/ /
| * / changelogMario Vavti2018-10-291-0/+22
| |/
| * Merge branch 'dev' into 'dev'M. Dent2018-10-282-10/+24
| |\
| | * fix issues with forum handling in mod network and ping. also some code cleanup.Mario Vavti2018-10-272-10/+24
| |/
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-271-6/+15
| |\
| * \ Merge branch 'dev' into 'dev'M. Dent2018-10-261-6/+8
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 00:12:02 +0000