Commit Graph

23681 Commits

Author SHA1 Message Date
harukin
1f70331a12 2018-11-01 12:04:21 +09:00
harukin
38e3369566 2018-11-01 10:40:58 +09:00
harukin
7303cdbe08 2018-11-01 10:32:16 +09:00
harukin
4677e34ea6 2018-11-01 10:20:22 +09:00
harukin
a48dc3ddf6 2018-11-01 10:13:48 +09:00
harukin
c548969877 2018-11-01 09:55:26 +09:00
harukin
68150edbb9 2018-11-01 09:50:24 +09:00
harukin
8e347e1b2e 2018-11-01 09:47:43 +09:00
harukin
b26989f594 2018-11-01 09:08:25 +09:00
harukin
0a3259d77c 2018-11-01 09:07:30 +09:00
harukin
d95492c5d0 2018-11-01 09:03:09 +09:00
harukin
3555c7f0c5 2018-10-31 22:04:50 +09:00
harukin
272e2d5654 2018-10-31 21:31:56 +09:00
Mario Vavti
3dab0d365d css fix for reshared-content images and whitespace 2018-10-31 13:20:09 +01:00
harukin
3abd110d45 2018-10-31 21:19:37 +09:00
harukin
cebb406277 2018-10-31 20:58:18 +09:00
harukin
71e4f1c8a7 2018-10-31 20:01:59 +09:00
harukin
403e42b662 2018-10-31 19:20:29 +09:00
harukin
a5598c33f3 2018-10-31 17:54:29 +09:00
harukin
0c1cc32017 2018-10-31 17:52:29 +09:00
harukin
994fb6c043 2018-10-31 17:43:50 +09: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
harukin
a1842491ad 2018-10-31 17:30:40 +09:00
harukin
241e449564 2018-10-31 16:31:28 +09:00
harukin
ad8848f96a 2018-10-31 16:23:56 +09:00
harukin
7f3c1a89c3 2018-10-31 16:20:09 +09: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
Your Name
d12c6ccb72 2018-10-29 21:44:52 +09:00
Your Name
1eb63fd8b9 2018-10-29 21:41:43 +09:00
Your Name
2cf2171ac2 test 2018-10-29 21:25:16 +09: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