harukin
|
9a776b3cdf
|
Merge branch 'origin' into 'japanese'
Update 4.4.1
See merge request harukin/core!62
|
2019-08-17 08:42:47 +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 |
|
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 |
|
Max Kostikov
|
33e2582918
|
Update zid.php
|
2019-08-08 18:29:26 +02:00 |
|
Max Kostikov
|
1c2f413211
|
Formatting
|
2019-08-08 18:27:07 +02:00 |
|
Max Kostikov
|
2300581c93
|
Catch and exclude trailing punctuation while URL embedding
|
2019-08-08 18:19:07 +02:00 |
|
Max Kostikov
|
829e915c90
|
Merge branch 'dev' into 'dev'
Do not limit channel if service class property value set with 0
See merge request hubzilla/core!1697
|
2019-07-31 17:21:06 +02:00 |
|
Max Kostikov
|
aaffc7485d
|
Update account.php
|
2019-07-31 17:18:11 +02:00 |
|
Max Kostikov
|
9ea1d6e8af
|
Do not limit channel if service class property value set with 0
|
2019-07-31 17:09:24 +02:00 |
|
Mario
|
17661b4b5f
|
Merge branch 'dev' into 'dev'
Do not control limits on service class settings with 0 values
See merge request hubzilla/core!1696
|
2019-07-30 23:08:42 +02:00 |
|
Max Kostikov
|
d4a038c437
|
Update account.php
|
2019-07-30 13:59:12 +02:00 |
|
Max Kostikov
|
59fed33797
|
Do not control limits on service class settings with 0 values
|
2019-07-30 11:54:14 +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 |
|
Mario Vavti
|
db6e4d1c32
|
admin should be allowed to delete any item
|
2019-07-13 19:59:52 +02:00 |
|
Mario Vavti
|
090d921006
|
webfinger: better handling of URLs that contain a @
|
2019-07-12 12:43:12 +02:00 |
|
zotlabs
|
65cd33cb15
|
zot_finger() and Zotlabs\Zot\Finger::run() have different output. Adjusted accordingly.
|
2019-06-28 16:59:15 -07:00 |
|
zotlabs
|
4aa59226d7
|
I wonder how long zot_finger() has been missing and how this may have affected the directory servers.
|
2019-06-28 16:49:23 -07:00 |
|
zotlabs
|
d53c98860d
|
minor fix
|
2019-06-28 16:29:56 -07:00 |
|
zotlabs
|
98100520eb
|
begin directory migration to zot6, see the code comments
|
2019-06-28 16:21:54 -07:00 |
|
zotlabs
|
60c003733e
|
photo objects: incorrect media type on links
|
2019-06-27 17:36:29 -07:00 |
|
zotlabs
|
9def9a5cb7
|
support zot and zot6 in social graph operations (suggestions, common friends)
|
2019-06-27 17:05:25 -07:00 |
|
zotlabs
|
d83ce0863a
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-06-26 21:54:50 -07:00 |
|
zotlabs
|
cf844cb27c
|
http signature consolidation
|
2019-06-26 21:45:21 -07:00 |
|
Mario
|
40bbdfdf6a
|
Merge branch 'dev' into 'dev'
provide auto redirect from zot6 /item permalinks
See merge request hubzilla/core!1684
|
2019-06-26 09:21:22 +02:00 |
|
Mario
|
ad8ad0ccd7
|
Merge branch 'fix-item_export-api-path' into 'dev'
Make export_page API endpoint match ZAP
See merge request hubzilla/core!1683
|
2019-06-26 09:21:09 +02:00 |
|
Mario
|
1cf012650b
|
Merge branch 'export_items-export_all' into 'dev'
Export items export all
See merge request hubzilla/core!1680
|
2019-06-26 09:20:54 +02:00 |
|
zotlabs
|
4f280b5497
|
allow api login by address or url (url will use zot6 hubloc records, address can use either zot or zot6 hubloc records)
|
2019-06-25 18:47:16 -07:00 |
|
DM42.Net (Matt Dent)
|
07f850ed15
|
Make export_page API endpoint match ZAP
|
2019-06-23 20:23:03 -04:00 |
|
Max Kostikov
|
1b6fbe3a2e
|
Merge branch 'dev' into 'dev'
Fix thumbnails processing logic on files sync
See merge request hubzilla/core!1682
|
2019-06-21 23:26:12 +02:00 |
|
Max Kostikov
|
b1b415ec5b
|
Fix thumbnails processing logic on files sync
|
2019-06-21 23:15:16 +02:00 |
|
Max Kostikov
|
8730bbac2f
|
Revert "Respect photo thumbnails storage in import"
This reverts commit e8918ca149
|
2019-06-21 22:42:38 +02:00 |
|
Max Kostikov
|
e8918ca149
|
Respect photo thumbnails storage in import
|
2019-06-21 22:27:27 +02:00 |
|
DM42.Net (Matt Dent)
|
82478eef09
|
export all items except photos
|
2019-06-21 14:23:16 -04:00 |
|
Mario Vavti
|
3dd6499ac4
|
fix mid not dbesc'd. the comment was no longer true. this fixes an issue with mid's that contain single quotes
|
2019-06-21 10:37:09 +02:00 |
|
Mario
|
5b727065cf
|
Merge branch 'dev' into 'dev'
changes to support direct messages in zot6 (set item.item_private = 2 when...
See merge request hubzilla/core!1679
|
2019-06-20 17:32:10 +02:00 |
|
zotlabs
|
9d156141b1
|
changes to support direct messages in zot6 (set item.item_private = 2 when private mentions are used and federate with zot:directMessage attribute which aligns with litepub:directMessage)
|
2019-06-19 17:32:38 -07:00 |
|
Max Kostikov
|
75746d714a
|
Update zid.php
|
2019-06-19 09:39:56 +02:00 |
|
Max Kostikov
|
983d6d3b42
|
Include Zot6 hubs in the Grid scope
|
2019-06-18 22:17:50 +02:00 |
|
Mario
|
fc2a038ee1
|
Merge branch 'dev' into 'dev'
minor zot6 compatibility issues uncovered through daily use
See merge request hubzilla/core!1671
|
2019-06-18 10:35:50 +02:00 |
|
zotlabs
|
becaa3b920
|
minor zot6 compatibility issues uncovered through daily use
|
2019-06-17 18:30:05 -07:00 |
|