Commit Graph

24902 Commits

Author SHA1 Message Date
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
e8f3b7f853 Merge branch '4.4RC' 2019-08-13 09:46:01 +02:00
Mario Vavti
e28341ca4b bump version 2019-08-13 09:44:28 +02:00
Mario Vavti
6c11a020ee Merge branch 'dev' into 4.4RC 2019-08-13 09:42:21 +02:00
Mario Vavti
7200c2ac0c update changelog 2019-08-13 09:41:58 +02:00
Mario Vavti
732ca49b02 Merge branch 'dev' into 4.4RC 2019-08-13 09:34:32 +02:00
Mario Vavti
ee976ed460 update directory servers 2019-08-13 09:33:23 +02:00
Mario Vavti
06ac3e896a Merge branch 'dev' into 4.4RC 2019-08-13 09:27:03 +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
f5062c0507 Merge branch 'dev' into 4.4RC 2019-08-11 10:56:00 +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
Mario Vavti
7a7f57fa45 Merge branch 'dev' into 4.4RC 2019-08-11 10:23:14 +02:00
Max Kostikov
047dd31724 Merge branch 'dev' into 'dev'
Improve plink to share tag detection

See merge request hubzilla/core!1704
2019-08-10 11:23:51 +02:00
Max Kostikov
0ce1a200f7 Improve plink to share tag detection 2019-08-10 11:15:48 +02:00
Mario Vavti
0e0024218f Merge branch 'dev' into 4.4RC 2019-08-09 22:21:40 +02:00
Mario Vavti
4886d088e9 use stripos() to match the body against terms in format_hashtags() 2019-08-09 22:19:51 +02:00
Mario Vavti
6eec6e2d65 update changelog 2019-08-09 21:58:25 +02:00
Mario Vavti
6c12880f5b fix version 2019-08-09 20:37:06 +02:00
Mario Vavti
eb472111a8 Merge branch 'dev' into 4.4RC 2019-08-09 20:35:25 +02:00
Mario Vavti
8d8b7ed567 make fetch logging less chatty
(cherry picked from commit 130cfbf231)
2019-08-09 20:34:38 +02:00
Mario Vavti
681dc70205 Merge branch 'dev' into 4.4RC 2019-08-09 20:33:45 +02:00
Mario Vavti
130cfbf231 make fetch logging less chatty 2019-08-09 20:33:03 +02:00
Mario
940e4a6152 Merge branch 'dev' into 'dev'
Replace plink URL with 'share' tag if possible

See merge request hubzilla/core!1703
2019-08-09 20:26:54 +02:00
Max Kostikov
38f7d9ad37 Replace plink URL with 'share' tag if possible 2019-08-09 19:01:21 +02:00
Max Kostikov
e896d316f2 Merge branch 'dev' into 'dev'
More intelligent quotation shortening while link embedding

See merge request hubzilla/core!1702
2019-08-09 17:05:05 +02:00
Max Kostikov
af690b64d6 More intelligent quotation shortening while link embedding 2019-08-09 16:59:14 +02:00