Commit graph

21992 commits

Author SHA1 Message Date
zotlabs
b97ac5acd4 missing encryption on sync 2018-07-29 23:12:05 -07:00
zotlabs
b374a6f911 more channel sync debugging 2018-07-29 22:13:43 -07:00
zotlabs
9c479be7df communication testing 2018-07-29 20:19:02 -07:00
zotlabs
d3686ffee4 missing namespace 2018-07-29 19:19:28 -07:00
zotlabs
9744d35a5c clone issues 2018-07-29 18:58:33 -07:00
zotlabs
d67f335ce8 set directory to master if no fallbacks present 2018-07-29 18:25:11 -07:00
zotlabs
c08d9a3d45 wrong update number 2018-07-29 18:22:49 -07:00
zotlabs
ee08b67bb6 zot6 discovery sanitisation 2018-07-29 17:54:53 -07:00
zotlabs
1def8da7bc fix unsanitised xchan_name 2018-07-29 17:36:05 -07:00
zotlabs
f7e9cd5a8f SECURITY: sanitise vcard fields 2018-07-29 17:36:05 -07:00
zotlabs
5ec73e6862 Revert "Merge branch 'red'"
This reverts commit 159f24afe3, reversing
changes made to dd899418c1.
2018-07-29 17:17:33 -07:00
zotlabs
159f24afe3 Merge branch 'red' 2018-07-29 16:48:14 -07:00
zotlabs
9701516228 fix unsanitised xchan_name 2018-07-28 17:17:12 -07:00
zotlabs
2367d94a42 SECURITY: sanitise vcard fields 2018-07-28 15:33:20 -07:00
zotlabs
dd899418c1 app fixes
Merge branch 'red'
2018-07-27 15:31:19 -07:00
zotlabs
38c2070aab Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-27 15:27:52 -07:00
zotlabs
a0f28708ab don't sync system apps 2018-07-27 15:05:29 -07:00
zotlabs
e25d205a7f app delete issue with base installed apps and app photo being reloaded uneccessarily 2018-07-27 14:36:06 -07:00
zotlabs
e28dab17d6 app update and ownership issues 2018-07-27 13:59:27 -07:00
zotlabs
07d0921aef fixes to clone import 2018-07-26 19:37:04 -07:00
zotlabs
993e39b192 rewrite the verification/discovery combined step to eliminate looping 2018-07-26 03:51:45 -07:00
Mario Vavti
ec3a066e4e fix sql error 2018-07-26 09:32:52 +02:00
zotlabs
ecc9da2c1e resolve zotfinger looping on malformed input 2018-07-25 19:56:24 -07:00
zotlabs
f149b8838b misc fixes 2018-07-24 20:21:01 -07:00
Mario
d39942902c Merge branch 'patch-4' into 'dev'
Update hmessages.po

See merge request hubzilla/core!1238
2018-07-23 19:57:43 +02:00
Mario
87fc4e6588 Merge branch 'patch-5' into 'dev'
Update hstrings.php

See merge request hubzilla/core!1239
2018-07-23 19:57:10 +02:00
Mario
84e57d040b Merge branch 'patch-2' into 'dev'
Escape internal quotes in translation on export

See merge request hubzilla/core!1237
2018-07-23 19:55:00 +02:00
kostikov
a4f64c02d0 Update hstrings.php 2018-07-23 12:20:50 +02:00
kostikov
278eeb5ee9 Update hmessages.po 2018-07-23 12:19:46 +02:00
kostikov
3342fc2244 Update hstrings.php 2018-07-23 12:15:10 +02:00
kostikov
87857fe5d9 Update hmessages.po 2018-07-23 12:14:33 +02:00
zotlabs
54eb1be4c4 webfinger return false until I can stop the looping 2018-07-22 23:53:28 -07:00
zotlabs
4f7f6edd15 default in case crypto_encapsulate fails 2018-07-22 23:33:13 -07:00
zotlabs
ceaa444ea4 sigs 2018-07-22 23:28:18 -07:00
zotlabs
cbeeeae243 logging 2018-07-22 23:23:02 -07:00
zotlabs
b484441438 sync fixes 2018-07-22 23:06:45 -07:00
zotlabs
626a0ab788 only clone between similar platforms 2018-07-22 22:28:46 -07:00
zotlabs
cf03855f65 more import work 2018-07-22 22:18:58 -07:00
zotlabs
c6fc88b300 item lookups 2018-07-22 22:17:07 -07:00
zotlabs
b7ff2f5585 more libzot 2018-07-22 22:10:51 -07:00
zotlabs
647e92d6f7 use libzot 2018-07-22 22:04:20 -07:00
zotlabs
2542bc5b38 sync location 2018-07-22 17:50:01 -07:00
kostikov
64efd07f6b Escape internal quotes in translation on export 2018-07-22 19:39:53 +02:00
Mario Vavti
6be66d6df9 update changelog 2018-07-21 22:01:59 +02:00
Mario
a68934f498 Merge branch 'patch-2' into 'dev'
New russian templates

See merge request hubzilla/core!1233
2018-07-21 11:29:09 +02:00
Mario
95ef78ab23 Merge branch 'patch-1' into 'dev'
Add var to respect current hstrings.php format

See merge request hubzilla/core!1231
2018-07-21 11:27:49 +02:00
Mario
5be0743751 Merge branch 'dev' into 'dev'
Update russian translation for 3.6

See merge request hubzilla/core!1230
2018-07-21 11:26:43 +02:00
kostikov
8fc7f2aca1 Update update_fail_eml.tpl 2018-07-20 19:28:45 +02:00
kostikov
4db4ab9798 Create register_verify_member.tpl 2018-07-20 19:28:13 +02:00
kostikov
b6c2c8117e Update register_verify_eml.tpl 2018-07-20 19:27:29 +02:00