Mario
75f7b1e261
Merge branch 'patch-3' into 'dev'
...
Update hmessages.po
See merge request hubzilla/core!1365
2018-11-03 13:22:34 +01:00
Mario
9af35d998f
Merge branch 'patch-2' into 'dev'
...
Update hstrings.php
See merge request hubzilla/core!1364
2018-11-03 13:21:53 +01:00
Mario
34e3f3907a
Merge branch 'patch-22' into 'dev'
...
More precise content encoding detection on conversion
See merge request hubzilla/core!1363
2018-11-03 13:21:22 +01:00
Max Kostikov
46b0510b99
Update Linkinfo.php
2018-11-03 10:41:31 +01:00
Max Kostikov
a7624ea48b
Update Linkinfo.php
2018-11-03 00:10:05 +01:00
Max Kostikov
2f3b4a7aaf
Update Linkinfo.php
2018-11-03 00:01:15 +01:00
Max Kostikov
a9bbe0b128
Update Linkinfo.php
2018-11-02 22:40:48 +01:00
Max Kostikov
0d9d0a4b70
more precise codepage detection
2018-11-02 22:37:53 +01:00
gia vec
8235d0bd50
Update hmessages.po
2018-11-02 19:41:07 +01:00
gia vec
c2e01bedc5
Update hstrings.php
2018-11-02 19:27:11 +01:00
Max Kostikov
32c4614a32
Workaround for incorrect ISO-8859-5 encoded content conversion
2018-11-02 10:52:52 +01:00
Mario
24ae6c91ea
Merge branch 'patch-21' into 'dev'
...
Fix wrong image resize for some external images
See merge request hubzilla/core!1362
2018-11-02 10:20:18 +01:00
M.Dent
346a4f5933
strpos needs to test with ===0 not ==0
2018-11-01 20:23:22 -04:00
Max Kostikov
c6551336c8
Fix wrong image resize for some external images
2018-11-01 21:50:36 +01:00
Mario Vavti
3dab0d365d
css fix for reshared-content images and whitespace
2018-10-31 13:20:09 +01:00
Mario Vavti
0252bac4ba
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-10-31 09:39:10 +01:00
Mario
b468069875
Merge branch 'patch-20' into 'dev'
...
Beautiful embedding for Hubzilla links
See merge request hubzilla/core!1360
2018-10-31 09:36:09 +01:00
Mike Macgirvin
7e1f431eca
yet another blueimp vulnerability. Move to composer.
2018-10-31 15:56:08 +11:00
zotlabs
70c55da1df
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-10-30 18:11:49 -07:00
M. Dent
f9ab7647dd
Merge branch 'composer-updates' into 'dev'
...
update html_to_markdown, smarty and sabredav libs via composer
See merge request hubzilla/core!1361
2018-10-31 01:32:44 +01:00
zotlabs
623aa7ea48
remove primary/clone counts from admin summary. The last checkins should fix 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.
2018-10-30 17:30:59 -07:00
M. Dent
046d264688
Merge branch 'forum-ping' into 'dev'
...
fix forum ping results - the term query requires xchan_name instead of…
See merge request hubzilla/core!1358
2018-10-31 01:25:41 +01:00
M. Dent
944e168120
Merge branch 'wikilist-widget' into 'dev'
...
allow wiki_list widget to be used in any page
See merge request hubzilla/core!1359
2018-10-31 01:24:32 +01:00
zotlabs
9594105e57
typo
2018-10-30 17:21:39 -07:00
zotlabs
675343f575
issue syncing the channel_primary setting which shows up as a wrong count on the admin summary page
2018-10-30 17:18:15 -07:00
Mario Vavti
fc6ff45c49
fix another markdown test
2018-10-30 22:51:52 +01:00
Mario Vavti
b4bac88c39
fix markdown tests
2018-10-30 22:37:41 +01:00
Mario Vavti
c622ba84b9
really fix html2markdown() - when using environment, we must set the defaults
2018-10-30 22:16:37 +01:00
Max Kostikov
339f95c647
Update oembed.php
2018-10-30 16:49:48 +01:00
Max Kostikov
ec67e0ab22
Beautiful embedding for Hubzilla links
2018-10-30 15:38:19 +01:00
Mario Vavti
0b371c8103
fix html2markdown() and re-enable previously failing tests
2018-10-30 13:55:08 +01:00
Mario Vavti
2192ea6fdf
update html_to_markdown, smarty and sabredav libs via composer
2018-10-30 12:12:07 +01:00
M.Dent
0060f88c45
Add tracking of deleted pconfig variables
2018-10-29 23:04:13 -04:00
Mario Vavti
1eac4db491
fix forum ping results - the term query requires xchan_name instead of 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
2018-10-29 23:01:13 +01:00
Mario Vavti
0d2c3be367
allow wiki_list widget to be used in any page
2018-10-29 22:55:24 +01:00
Mario Vavti
0f19627407
changelog
2018-10-29 10:59:54 +01:00
M.Dent
1241e778f9
Fix to set update time in pconfig on update
2018-10-28 17:30:22 -04:00
M.Dent
3ab0ef1902
Add timestamp and associated logic to pconfig
2018-10-28 17:23:31 -04:00
M.Dent
c7c35b8b5a
DB Updates to prep for pconfig timestamps.
2018-10-28 17:20:29 -04:00
M. Dent
3d9b1fd343
Merge branch 'dev' into 'dev'
...
fix issues with forum handling in mod network and ping. also some code cleanup.
See merge request hubzilla/core!1354
2018-10-28 03:22:22 +01:00
Mario Vavti
96bed3a623
fix issues with forum handling in mod network and ping. also some code cleanup.
2018-10-27 22:34:18 +02:00
Mario Vavti
e72b0edce2
Merge remote-tracking branch 'mike/master' into dev
2018-10-27 13:50:30 +02:00
zotlabs
ae4aeb4b1e
delivery chain linkage messed up if original post was edited
2018-10-26 13:00:26 -07:00
M. Dent
302abc2a60
Merge branch 'dev' into 'dev'
...
notifications: fix unseen forum count
See merge request hubzilla/core!1351
2018-10-26 17:10:10 +02:00
Mario Vavti
2b3cbc638b
notifications: fix unseen forum count
2018-10-26 09:53:56 +02:00
Mario
df449e7bfe
Merge branch 'dev' into 'dev'
...
New strings in Spanish translation
See merge request hubzilla/core!1349
2018-10-26 08:16:16 +02:00
Mario
6326a50d20
Merge branch 'patch-20181025a' into 'dev'
...
Add entropy to queue worker - and fix requeuing of expired tasks
See merge request hubzilla/core!1350
2018-10-26 08:15:11 +02:00
M.Dent
aef212ada9
Add entropy to queue worker - and fix requeuing of expired tasks
2018-10-25 10:12:03 -04:00
Manuel Jiménez Friaza
802a7ff3a8
New strings in Spanish translation
2018-10-25 11:37:06 +02:00
M. Dent
9cedc864c2
Merge branch 'dev' into 'dev'
...
Editor contact autocomplete performance & refine stream filter and forum notification behaviour (mostly for performance)
See merge request hubzilla/core!1348
2018-10-25 03:38:05 +02:00
