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
|
c8dd516d6c
|
Merge branch 'dev'
|
2018-10-29 11:02:51 +01:00 |
|
Mario Vavti
|
0f19627407
|
changelog
|
2018-10-29 10:59:54 +01:00 |
|
Mario Vavti
|
3eb71fe7b5
|
merge Zotlabs/Access/PermissionLimits.php from dev
|
2018-10-29 10:21:10 +01:00 |
|
Mario Vavti
|
0035584d91
|
merge view/fr/hmessages.po from dev
|
2018-10-29 10:20:36 +01:00 |
|
Mario Vavti
|
8cbd2e3e9e
|
merge view/ru/hstrings.php from dev
|
2018-10-29 10:19:55 +01:00 |
|
Mario Vavti
|
b0f5c7f36f
|
merge view/ru/hmessages.po from dev
|
2018-10-29 10:19:31 +01:00 |
|
Mario Vavti
|
412eb0a90b
|
merge view/it/hstrings.php from dev
|
2018-10-29 10:18:21 +01:00 |
|
Mario Vavti
|
f8e816629d
|
merge view/it/hmessages.po from dev
|
2018-10-29 10:17:54 +01:00 |
|
Mario Vavti
|
3d0138569d
|
merge view/es-es/hstrings.php from dev
|
2018-10-29 10:17:04 +01:00 |
|
Mario Vavti
|
7bb7d736a2
|
merge view/es-es/hmessages.po from dev
|
2018-10-29 10:16:29 +01:00 |
|
Mario Vavti
|
7910f39613
|
merge util/zotsh/zotsh.py from dev
|
2018-10-29 10:16:01 +01:00 |
|
Mario Vavti
|
bf6ef2a588
|
merge util/update_theme_repo from dev
|
2018-10-29 10:15:18 +01:00 |
|
Mario Vavti
|
a11d89daa3
|
merge util/update_autoloader from dev
|
2018-10-29 10:14:43 +01:00 |
|
Mario Vavti
|
b8a4a6b959
|
merge util/hmessages.po from dev
|
2018-10-29 10:10:03 +01:00 |
|
Mario Vavti
|
dd6045d9f8
|
merge install/schema_postgres.sql from dev
|
2018-10-29 10:08:37 +01:00 |
|
Mario Vavti
|
e1c3a19420
|
merge include/zot.php from dev
|
2018-10-29 10:08:12 +01:00 |
|
Mario Vavti
|
cc586685e6
|
merge include/nav.php from dev
|
2018-10-29 10:07:54 +01:00 |
|
Mario Vavti
|
31883f603c
|
merge include/import.php from dev
|
2018-10-29 10:07:15 +01:00 |
|
Mario Vavti
|
f377c81c8a
|
merge include/connections.php from dev
|
2018-10-29 10:06:44 +01:00 |
|
Mario Vavti
|
32384eaf07
|
merge Zotlabs/Widget/Wiki_pages.php from dev
|
2018-10-29 10:06:01 +01:00 |
|
Mario Vavti
|
7c2efa697c
|
merge Zotlabs/Module/Photo.php from dev
|
2018-10-29 10:04:34 +01:00 |
|
Mario Vavti
|
e1df69dfcb
|
Merge branch 'dev'
|
2018-10-29 07:43:40 +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 |
|