aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* more zot6 workzotlabs2018-11-052-18/+43
|
* populate new fieldszotlabs2018-11-052-16/+47
|
* z6 workzotlabs2018-11-054-5/+15
|
* these changes needed to ensure cloning/syncing works in the future to ↵zotlabs2018-11-052-44/+94
| | | | non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch
* debug zot6 discoveryzotlabs2018-11-041-118/+283
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-045-8/+13
|\
| * Merge branch 'dev' into 'dev'Mario2018-11-031-1/+1
| |\ | | | | | | | | | | | | Fixed typo at view/es-es/hstrings.php See merge request hubzilla/core!1366
| | * 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.po See merge request hubzilla/core!1365
| | * Update hmessages.pogia vec2018-11-021-3/+3
| | |
| * | Merge branch 'patch-2' into 'dev'Mario2018-11-031-1/+1
| |\ \ | | | | | | | | | | | | | | | | Update hstrings.php See merge request hubzilla/core!1364
| | * | Update hstrings.phpgia vec2018-11-021-1/+1
| | |/
| * | Merge branch 'patch-22' into 'dev'Mario2018-11-031-1/+6
| |\ \ | | |/ | |/| | | | | | | More precise content encoding detection on conversion See merge request hubzilla/core!1363
| | * 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 images See merge request hubzilla/core!1362
| | * Fix wrong image resize for some external imagesMax Kostikov2018-11-011-2/+2
| |/
* / z6 updates to owa, linkinfo improved image detectionzotlabs2018-11-042-11/+36
|/
* 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
| |\ | | | | | | | | | | | | Beautiful embedding for Hubzilla links See merge request hubzilla/core!1360
| | * 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
| |\ \ | | | | | | | | | | | | | | | | update html_to_markdown, smarty and sabredav libs via composer See merge request hubzilla/core!1361
| | * | 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… See merge request hubzilla/core!1358
| | * | fix forum ping results - the term query requires xchan_name instead of ↵Mario Vavti2018-10-291-4/+3
| | |/ | | | | | | | | | xchan_hash. also improve the query itself - item_permission_sql() is redundant here since we always deal with local_channel() and use count(id) instead of sum(item_unseen) to get the unseen count
| * | Merge branch 'wikilist-widget' into 'dev'M. Dent2018-10-312-5/+0
| |\ \ | | |/ | |/| | | | | | | allow wiki_list widget to be used in any page See merge request hubzilla/core!1359
| | * 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. See merge request hubzilla/core!1354
| | * 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
| |\ \ | | | | | | | | | | | | | | | | notifications: fix unseen forum count See merge request hubzilla/core!1351
| | * | notifications: fix unseen forum countMario Vavti2018-10-261-6/+8
| |/ /
| * | Merge branch 'dev' into 'dev'Mario2018-10-262-443/+516
| |\ \ | | | | | | | | | | | | | | | | New strings in Spanish translation See merge request hubzilla/core!1349
| | * | New strings in Spanish translationManuel Jiménez Friaza2018-10-252-443/+516
| | | |
| * | | Merge branch 'patch-20181025a' into 'dev'Mario2018-10-261-2/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | Add entropy to queue worker - and fix requeuing of expired tasks See merge request hubzilla/core!1350
| | * | Add entropy to queue worker - and fix requeuing of expired tasksM.Dent2018-10-251-2/+3
| |/ /
* | | remove primary/clone counts from admin summary. The last checkins should fix ↵zotlabs2018-10-301-3/+1
| | | | | | | | | | | | this count "eventually" but the information has little direct value and may require location information for a local channel to change before it is actually corrected.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 04:05:44 +0000