aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* version 3.8.33.8.3Mario Vavti2018-11-051-1/+1
|
* update changelogMario Vavti2018-11-051-0/+14
|
* update linkinfo from devMario Vavti2018-11-051-7/+30
|
* Merge branch 'dev'Mario Vavti2018-11-05316-5295/+6481
|\
| * Merge branch 'dev' into 'dev'Mario2018-11-052-2/+6
| |\ | | | | | | | | | | | | more fixes for forum notifications handling: do not count likes/dislikes if… See merge request hubzilla/core!1367
| | * more fixes for forum notifications handling: do not count likes/dislikes if ↵Mario Vavti2018-11-032-2/+6
| | | | | | | | | | | | likes notifications are disabled and also do not show like activities when clicking a forum notification and like notifications are disabled
| * | 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
| |/
| * 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
| | |/
| * | 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.
| * | typozotlabs2018-10-301-1/+1
| | |
| * | issue syncing the channel_primary setting which shows up as a wrong count on ↵zotlabs2018-10-302-19/+17
| | | | | | | | | | | | the admin summary page
* | | Merge branch 'dev'3.8.2Mario Vavti2018-10-291-0/+22
|\ \ \ | | |/ | |/|
| * | changelogMario Vavti2018-10-291-0/+22
| | |
* | | merge Zotlabs/Access/PermissionLimits.php from devMario Vavti2018-10-291-1/+1
| | |
* | | merge view/fr/hmessages.po from devMario Vavti2018-10-291-50/+2
| | |
* | | merge view/ru/hstrings.php from devMario Vavti2018-10-291-5/+1
| | |
* | | merge view/ru/hmessages.po from devMario Vavti2018-10-291-19/+19
| | |
* | | merge view/it/hstrings.php from devMario Vavti2018-10-291-1/+1
| | |
* | | merge view/it/hmessages.po from devMario Vavti2018-10-291-41/+39
| | |
* | | merge view/es-es/hstrings.php from devMario Vavti2018-10-291-2/+0
| | |