harukin
|
6859053727
|
Revert "Revert "Merge branch 'develop' into 'origin'""
This reverts commit 8c207cf1eb.
|
2019-12-29 13:59:00 +09:00 |
|
harukin
|
8c207cf1eb
|
Revert "Merge branch 'develop' into 'origin'"
This reverts commit e1922bd555.
|
2019-12-29 13:53:59 +09:00 |
|
harukin
|
e1922bd555
|
Merge branch 'develop' into 'origin'
# Conflicts:
# view/ja/hstrings.php
|
2019-12-29 13:31:01 +09:00 |
|
Mario
|
004861fbb7
|
merge opengraph fixes from dev
|
2019-11-25 08:41:34 +00:00 |
|
Mario
|
05604e4bd2
|
onepoll: do not update dead feeds
(cherry picked from commit 5a6b14f8787927ee6ea99c622d02875811d3a74a)
|
2019-11-15 11:03:54 +01:00 |
|
Mario
|
fd7d497cd1
|
make inline pdf a security option, move thumbnail security to security options from admin/site
(cherry picked from commit de9a7f0fa909792656d26d369f2ff21c57fc1e4d)
|
2019-11-15 11:03:38 +01:00 |
|
zotlabs
|
3a2fdec241
|
wildcard tag issue
(cherry picked from commit 2f4c619d510e64eeda05366e485d50f490cefebe)
|
2019-11-13 08:57:12 +01:00 |
|
Max Kostikov
|
478014f02a
|
Better BBcode to Markdown conversion
|
2019-11-08 23:35:05 +01:00 |
|
zotlabs
|
00dd52317a
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-11-08 13:10:24 -08:00 |
|
zotlabs
|
17522b31e9
|
exempt svg from tag completion
|
2019-11-08 13:07:42 -08:00 |
|
Max Kostikov
|
13c05e7937
|
Merge branch 'dev' into 'dev'
Do not trim a sufficiently shortened Opengraph description
See merge request hubzilla/core!1774
|
2019-11-08 18:13:52 +01:00 |
|
Max Kostikov
|
3706afbd01
|
Do not trim a sufficiently shortened Opengraph description
|
2019-11-08 16:19:08 +01:00 |
|
Zot
|
a6165c00ce
|
svg stuff
|
2019-11-08 10:47:00 +01:00 |
|
zotlabs
|
a5826fec25
|
svg stuff
|
2019-11-07 14:51:29 -08:00 |
|
Max Kostikov
|
b6314c109d
|
Sanitize title on Atom/RSS feed import
|
2019-11-07 09:14:51 +01:00 |
|
Max Kostikov
|
f8955f90b8
|
Move title sanitizer code in the right place
|
2019-11-06 16:14:57 +01:00 |
|
Max Kostikov
|
9248fc96b3
|
Formatting
|
2019-11-06 16:11:10 +01:00 |
|
Max Kostikov
|
2875ee2423
|
Update feedutils.php
|
2019-11-06 16:08:36 +01:00 |
|
Max Kostikov
|
36f707b25e
|
Sanitize title on Atom/RSS feed import
|
2019-11-06 16:07:04 +01:00 |
|
Mario
|
a049664219
|
fix query with protocol prefix not always picking the right xchan
(cherry picked from commit 03317b9864c0d7c99e144404c647b9923d8d29ea)
|
2019-11-04 09:39:56 +01:00 |
|
M. Dent
|
707b19dc35
|
Add hook to comments_are_now_closed()
|
2019-11-03 10:12:11 +01:00 |
|
Max Kostikov
|
1a56ecaa39
|
Update opengraph.php
|
2019-10-15 14:04:24 +02:00 |
|
Max Kostikov
|
d778c3cf19
|
Better Opengraph image type detection
|
2019-10-15 14:03:41 +02:00 |
|
M. Dent
|
7d0e576e3b
|
Updates to zcard/profile images and other public images to account for infrastructure caches (CDN)
|
2019-10-14 22:28:48 +02:00 |
|
Max Kostikov
|
5edeb0250b
|
Revert "Remove visible channels list from pubstream tags cloud creation procedure"
This reverts commit 5c4c6e68f6
|
2019-10-13 14:27:54 +02:00 |
|
Max Kostikov
|
79b0a6ba9c
|
Allow addons to process forum posts published through mentions
|
2019-10-05 10:31:47 +02:00 |
|
Mario Vavti
|
1fbc8739b9
|
fix bbcode event reshare timezone issue
(cherry picked from commit 79bcc157bf8f0c67a8ee41ae9c53a9dec969f8d1)
|
2019-10-04 09:25:39 +02:00 |
|
Max Kostikov
|
407b9c9cd7
|
Sync private items with clones; avoid sync if no local connection with thread owner
|
2019-09-30 16:19:39 +02:00 |
|
M. Dent
|
7c5cfe6697
|
Notify on custom items - rework hooks
|
2019-09-23 10:11:27 +02:00 |
|
Max Kostikov
|
f2b121cd58
|
Merge branch 'dev' into 'dev'
Zot -> Zot6 translation issue, liking a "new friend" activity
See merge request hubzilla/core!1723
|
2019-09-10 10:40:53 +02:00 |
|
zotlabs
|
d9052c7e3c
|
Zot -> Zot6 translation issue, liking a "new friend" activity
|
2019-09-03 17:00:10 -07:00 |
|
Max Kostikov
|
914a096b42
|
Merge branch 'dev' into 'dev'
improved conversion of emoji reactions from zot to zot6
See merge request hubzilla/core!1720
|
2019-09-03 14:33:09 +02:00 |
|
Terrox
|
93ec01e0a1
|
More nofollow tags to discourage backlink farmers
|
2019-09-03 14:32:52 +02:00 |
|
zotlabs
|
bbc98db6b4
|
Clarify private mail deletion policy. Related to issue #1391.
|
2019-08-31 14:43:08 -07:00 |
|
Max Kostikov
|
df842a8e8d
|
Merge branch 'dev' into 'dev'
Better spoiler BBcode tag conversion to Markdown
See merge request hubzilla/core!1718
|
2019-08-24 00:00:58 +02:00 |
|
Max Kostikov
|
60919488f1
|
Better spoiler BBcode tag conversion to Markdown
|
2019-08-23 23:58:07 +02:00 |
|
Max Kostikov
|
35790c584b
|
Merge branch 'dev' into 'dev'
possible for DB to return hublocs with no sitekey
See merge request hubzilla/core!1713
|
2019-08-22 20:29:53 +02:00 |
|
Max Kostikov
|
58d7c7f6ae
|
Fix attach permissions sync for clonned channel
|
2019-08-22 20:20:54 +02:00 |
|
Max Kostikov
|
cf9ef615c9
|
Fix spoiler displaying while convert BBcode to markdown
|
2019-08-22 20:17:22 +02:00 |
|
zotlabs
|
8c96032b2b
|
Merge branch 'dev' of https://framagit.org/zot/core into dev
|
2019-08-21 18:51:25 -07:00 |
|
zotlabs
|
d256551907
|
possible for DB to return hublocs with no sitekey
|
2019-08-21 18:50:38 -07:00 |
|
harukin
|
63d7bfde81
|
Merge branch 'origin' into 'develop'
Update 4.4.1
See merge request harukin/core!61
|
2019-08-17 08:38:51 +09:00 |
|
zotlabs
|
c997360b4a
|
show correct profile photo when previewing and editing profiles
(cherry picked from commit 808baf203d)
|
2019-08-16 19:33:38 +02:00 |
|
zotlabs
|
88fa18204f
|
illegal offset warning (prevents encrypted signatures from being used for encrypted messages). Not fatal but can leak metadata.
(cherry picked from commit feda23587c)
|
2019-08-16 19:29:21 +02:00 |
|
zotlabs
|
808baf203d
|
show correct profile photo when previewing and editing profiles
|
2019-08-15 19:18:46 -07:00 |
|
zotlabs
|
feda23587c
|
illegal offset warning (prevents encrypted signatures from being used for encrypted messages). Not fatal but can leak metadata.
|
2019-08-13 16:53:04 -07:00 |
|
Mario Vavti
|
4886d088e9
|
use stripos() to match the body against terms in format_hashtags()
|
2019-08-09 22:19:51 +02:00 |
|
Max Kostikov
|
699aad8626
|
Merge branch 'dev' into 'dev'
Catch and exclude trailing punctuation while URL embedding
See merge request hubzilla/core!1701
|
2019-08-08 18:53:14 +02:00 |
|
Max Kostikov
|
4382e53acb
|
Remove condition
|
2019-08-08 18:37:05 +02:00 |
|
Max Kostikov
|
832adf92a6
|
Update zid.php
|
2019-08-08 18:30:08 +02:00 |
|