Commit Graph

24738 Commits

Author SHA1 Message Date
zotlabs b6590e95b5 issue with bearcap tests 2019-09-26 18:34:08 -07:00
zotlabs 375c2a87c7 change event formatting slightly for Zot6 and ActivityStreams. 2019-09-16 23:27:41 -07:00
zotlabs d9052c7e3c Zot -> Zot6 translation issue, liking a "new friend" activity 2019-09-03 17:00:10 -07:00
zotlabs bbc98db6b4 Clarify private mail deletion policy. Related to issue #1391. 2019-08-31 14:43:08 -07:00
zotlabs 1f8d29a221 improved conversion of emoji reactions from zot to zot6 2019-08-31 14:04:10 -07:00
zotlabs 8cc4003837 issues with image import to zot6 - wrong mid. Also label source project of zotfeed since it is not completely compatible across projects. 2019-08-22 19:39:11 -07: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 09d7cf2cc1 Merge branch 'dev' into 'dev'
Fix attach permissions sync for clonned channel

See merge request hubzilla/core!1716
2019-08-22 20:25:57 +02:00
Max Kostikov 58d7c7f6ae Fix attach permissions sync for clonned channel 2019-08-22 20:20:54 +02:00
Max Kostikov cab24836d8 Merge branch 'dev' into 'dev'
Fix spoiler displaying while convert BBcode to markdown

See merge request hubzilla/core!1715
2019-08-22 20:20:44 +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
Mario Vavti e5539c0d01 update changelog 2019-08-16 20:19:49 +02:00
Mario ea8621d6ec Merge branch 'dev' into 'dev'
zot6 compatibility: when posting from a non-primary clone the actor->id is...

See merge request hubzilla/core!1710
2019-08-16 19:32:08 +02:00
zotlabs ac05a2ede7 support "bearcaps" in Activity library 2019-08-15 21:30:47 -07:00
zotlabs 808baf203d show correct profile photo when previewing and editing profiles 2019-08-15 19:18:46 -07:00
zotlabs beeafc6bc5 fix bitrot in util/zotsh 2019-08-15 16:28:06 -07:00
zotlabs 6f8c977e73 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-08-15 13:49:02 -07:00
zotlabs 9a2fbdde20 zot6 compatibility: when posting from a non-primary clone the actor->id is that of the primary, resulting in an author/owner identity mismatch. Solution is to always post with the actor->id set to the sender if it is a local channel. 2019-08-14 17:55:56 -07:00
Max Kostikov b325b2c003 Merge branch 'dev' into 'dev'
illegal offset warning (prevents encrypted signatures from being used for...

See merge request hubzilla/core!1709
2019-08-14 16:35:55 +02: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 7200c2ac0c update changelog 2019-08-13 09:41:58 +02:00
Mario Vavti ee976ed460 update directory servers 2019-08-13 09:33:23 +02:00
Mario 6ce0f6e806 Merge branch 'dev_homeinstall_debian10' into 'dev'
Changes: Debian 10, MariaDB, adminer

See merge request hubzilla/core!1707
2019-08-13 09:23:36 +02:00
Max Kostikov e006586275 Merge branch 'rudocs' into 'dev'
Add more Russian context help

See merge request hubzilla/core!1708
2019-08-12 23:01:09 +02:00
Max Kostikov e9d6b17a00 Merge branch 'dev' into 'rudocs'
# Conflicts:
#   doc/context/ru/network/help.html
2019-08-12 22:55:12 +02:00
OJ Random bf2f199f37 Changes: Debian 10, MariaDB, adminer 2019-08-12 22:02:28 +02:00
Max Kostikov 718ca548be Delete .gitkeep 2019-08-12 21:57:24 +02:00
Max Kostikov 51c0dc070a Delete .gitkeep 2019-08-12 21:57:07 +02:00
Max Kostikov d5e0d52bc4 Update help.html 2019-08-12 21:56:50 +02:00
Max Kostikov f6b99db738 Update help.html 2019-08-12 21:52:21 +02:00
Max Kostikov ef69294072 Update help.html 2019-08-12 21:52:10 +02:00
Max Kostikov c56d395c90 Add Russian context help for Connections 2019-08-12 21:43:42 +02:00
Max Kostikov 778e9141d8 Add new directory 2019-08-12 21:27:50 +02:00
Max Kostikov c70a4662b4 Update help.html 2019-08-12 21:26:43 +02:00
Max Kostikov e441a31051 Update help.html 2019-08-12 12:04:46 +02:00
Max Kostikov 9f5ec5cc50 Update help.html 2019-08-12 12:02:00 +02:00
Max Kostikov 825ded2e08 Update help.html 2019-08-12 12:00:25 +02:00
Max Kostikov a7c3776557 Merge branch 'rudocs' into 'dev'
Add Russian context help and update translation

See merge request hubzilla/core!1706
2019-08-12 11:56:13 +02:00
Max Kostikov 1e7cfc2644 Update help.html 2019-08-12 11:38:34 +02:00
Max Kostikov c6fd32ffde Update help.html 2019-08-12 11:36:35 +02:00
Max Kostikov 5f551a8b47 Update hstrings.php 2019-08-12 11:33:03 +02:00
Max Kostikov f73ff57148 Update hmessages.po 2019-08-12 11:32:39 +02:00
Max Kostikov c538d7372e Add Russian context help for network page 2019-08-12 11:25:08 +02:00
Max Kostikov 4e7804ca75 Add new directory 2019-08-12 10:55:50 +02:00
Max Kostikov 8fe715983a Merge branch 'dev' into 'dev'
Updated Spanish translation

See merge request hubzilla/core!1705
2019-08-12 00:14:09 +02:00
Manuel Jiménez Friaza 4a3fb07d5f Updated Spanish translation 2019-08-11 11:15:07 +02:00
Mario Vavti f0d7a17b72 linkinfo: only allow to embed public items 2019-08-11 10:55:38 +02:00
Manuel Jiménez Friaza b89d2d7580 Merge remote-tracking branch 'upstream/dev' into dev 2019-08-11 10:39:03 +02:00