harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,387 Commits 6 Branches 36 Tags 152 MiB
bbcc9fe8d8
Commit Graph

707 Commits

Author SHA1 Message Date
harukin
bbcc9fe8d8 Revert "Merge branch 'develop' into 'origin'" 
This reverts commit e1922bd555.
 2019-12-29 13:55:08 +09:00
harukin
e1922bd555 Merge branch 'develop' into 'origin' 
# Conflicts:
#   view/ja/hstrings.php
 2019-12-29 13:31:01 +09:00
zotlabs
3a2fdec241 wildcard tag issue 
(cherry picked from commit 2f4c619d510e64eeda05366e485d50f490cefebe)
 2019-11-13 08:57:12 +01:00
zotlabs
17522b31e9 exempt svg from tag completion 2019-11-08 13:07:42 -08:00
zotlabs
a5826fec25 svg stuff 2019-11-07 14:51:29 -08: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
Mario Vavti
4886d088e9 use stripos() to match the body against terms in format_hashtags() 2019-08-09 22:19:51 +02:00
zotlabs
70e4a2c4fa Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-07-28 20:00:14 -07:00
zotlabs
696359daba fix urls on imported item taxonomy 2019-07-28 19:57:17 -07:00
Max Kostikov
5695350e98 Revert "Merge branch 'dev' into 'dev'" 
This reverts merge request !1694
 2019-07-25 12:25:27 +02:00
Mario Vavti
dc56d8560d pleroma uses slightly different URLs in body - also look for the string 2019-07-22 20:38:10 +02:00
Mario Vavti
c4de5b45df do not format hashtags with missing url 2019-07-18 13:19:10 +02:00
Max Kostikov
821af482f0 Exclude trailing punctuations from URL 2019-07-16 18:11:47 +02:00
Mario Vavti
3b73e5223e stringify_array_elms() could return weird results if the initial array key was not zero. this could trigger obscure bugs e.g. adding an empty string value to the recipients array in the notifier which could then select some broken hubloc/xchan entries. 2019-07-15 15:05:54 +02:00
harukin
76e879e5de Merge branch 'origin' into 'develop' 
Update 4.2

See merge request harukin/core!55
 2019-06-09 10:54:57 +09:00
Max Kostikov
a8e25ccfe6 Add single photo URL rewrite for clonned channel 2019-05-30 13:41:32 +02:00
Mario Vavti
973d91d120 add btlogger to unxmlify() 2019-05-11 16:42:53 +02:00
Max Kostikov
0e4acf6299 Replace photo URL for gallery on clonned channel post sync 2019-05-11 15:40:04 +02:00
Max Kostikov
d34d14c1f4 Replace own image URL in clonned channel posts 2019-05-08 10:40:46 +02:00
Mario Vavti
8847838c43 address xmlify/unxmlify performance issue 2019-05-01 15:40:06 +02:00
harukin
087b45ab90 Merge branch 'origin' into 'develop' 
marge from origin 4.1

See merge request harukin/core!45
 2019-03-21 21:42:45 +09:00
Mario
ebc3666c6f Cleanup and fixes 2019-03-15 02:51:51 +01:00
harukin
d8d46039a2 Merge branch 'origin' into 'develop' 
marge from origin 4.0

See merge request harukin/core!40
 2019-03-09 17:48:31 +09:00
Mario Vavti
9772726065 merge text.php and hmessages.po 2019-03-08 12:32:20 +01:00
Mario Vavti
8ecdde6cb5 Merge branch '4.0RC' 2019-03-08 11:52:57 +01:00
Mario
04b9216758 Merge branch 'dev' into 'dev' 
zot api changes to support combined content (items+files) import addon

See merge request hubzilla/core!1533
 2019-02-25 14:06:37 +01:00
zotlabs
1ff97754af issues uncovered testing combined item/file import 2019-02-24 21:43:15 -08:00
Mario Vavti
a0ad110cff fix summary and use item_normal_search() for viewsrc so we can also view the source for articles, cards, etc. 2019-02-21 08:48:47 +01:00
Mario Vavti
cf80f03084 Merge remote-tracking branch 'mike/master' into dev 2019-02-04 10:03:38 +01:00
zotlabs
8ff9a9ff08 fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream. 2019-02-03 16:53:49 -08:00
M. Dent
0ded1d326c Merge branch 'dev' into 'dev' 
Prevent Hubzilla usage for SEO backlinks

See merge request hubzilla/core!1501
 2019-02-01 18:01:01 +01:00
Max Kostikov
6462c83f69 Prevent Hubzilla usage for SEO backlinks 2019-02-01 15:47:51 +01:00
Klaus Weidenbach
13e0151cd2 Correct and extend Doxygen comments. 
Correct some documentation errors for Doxygen and add
more comments.
Document some undefined variables with @FIXME.
 2019-01-23 22:25:47 +01:00
Mario
51a7be29f5 Merge branch 'prepare_text' into 'dev' 
Correct parameter in include/text.php prepare_text()

See merge request hubzilla/core!1483
 2019-01-23 15:41:54 +01:00
Mario
ef46738384 Merge branch 'dev' into 'dev' 
Skip tags detection in URL

See merge request hubzilla/core!1482
 2019-01-23 15:39:13 +01:00
Klaus Weidenbach
ae538a2259 Correct parameter in include/text.php prepare_text() 
Also extend documentation.
 2019-01-22 23:25:30 +01:00
Max Kostikov
66f443fd00 Skip tags detection in URL 2019-01-22 16:23:44 +01:00
Mario Vavti
90b6afe06b we must sslify all possible content variables 2019-01-10 00:29:05 +01:00
harukin
ffadb70d81 Merge branch 'origin' into 'develop' 
merge upstream/master for 3.8.8

See merge request harukin/core!30
 2018-12-24 00:54:15 +09:00
Mario
04a2dc075f manualy remove scale_external_images() due to merge conflicts 2018-12-22 20:08:44 +01:00
Max Kostikov
3a66255576 Remove scale_external_images() 2018-12-17 13:29:37 +01:00
harukin
e8acf7e87a merge from upsream 3.8.6 release 2018-12-04 23:52:59 +09:00
Mario Vavti
9fcadc2d7c prevent incompatible export files (osada/zap) from being imported (manual patch from dev) 2018-12-03 11:08:39 +01:00
Mario Vavti
c50e3a702a more notifications fixes 
(cherry picked from commit 9ef6c57ca5)
 2018-12-03 10:49:08 +01:00
Mario Vavti
9ef6c57ca5 more notifications fixes 2018-12-03 10:46:49 +01:00
M. Dent
0b38ab259c Merge branch 'photocache' into 'dev' 
Add Photo Cache addon support

See merge request hubzilla/core!1412
 2018-12-02 19:33:54 +01:00
Max Kostikov
2a57e00cb4 Remove local_channel() check on cache_body_hook call 2018-12-02 10:07:12 +01:00
Max Kostikov
53d9cbc69c Check local_channel() before cache call 2018-11-30 11:38:47 +01:00
Max Kostikov
0ee403eab3 Move cache code to addon 2018-11-30 10:50:00 +01:00
Max Kostikov
6f2d09eb20 Fix wrong parameter 2018-11-29 23:28:45 +01:00