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 |
|
kostikov
|
86a42aad16
|
Update register_open_eml.tpl
|
2018-07-20 19:26:54 +02:00 |
|
kostikov
|
8e2e09bb16
|
Update passchanged_eml.tpl
|
2018-07-20 19:26:24 +02:00 |
|
kostikov
|
3713aa210f
|
Update lostpass_eml.tpl
|
2018-07-20 19:25:46 +02:00 |
|
kostikov
|
a65c23546b
|
Add new file
|
2018-07-20 19:21:58 +02:00 |
|
Mario Vavti
|
f6de91bf0f
|
prevent double file uploads when dropping files into jot
|
2018-07-20 16:44:43 +02:00 |
|
kostikov
|
062633d312
|
Add var to respect current hstrings.php format
|
2018-07-20 16:40:35 +02:00 |
|
Mario Vavti
|
4a54699c1f
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-07-20 10:42:45 +02:00 |
|
Mario Vavti
|
c72f6e6ea8
|
fix jot drag and drop
|
2018-07-20 10:42:16 +02:00 |
|
kostikov
|
790a9155d4
|
Update hstrings.php
|
2018-07-20 10:25:03 +02:00 |
|
kostikov
|
f141b845fd
|
Update hmessages.po
|
2018-07-20 10:24:23 +02:00 |
|
Mario
|
a274c87cb3
|
Merge branch 'dev' into 'dev'
Update php2po.php
See merge request hubzilla/core!1229
|
2018-07-20 09:21:35 +02:00 |
|
zotlabs
|
bd8a6d6195
|
updates
|
2018-07-19 22:15:50 -07:00 |
|
zotlabs
|
ad020db7d8
|
minor tweaks
|
2018-07-19 20:44:34 -07:00 |
|
zotlabs
|
a94c9d2709
|
checkjs fix ($page not bin-hex in all cases)
|
2018-07-19 17:19:19 -07:00 |
|
zotlabs
|
07e526693e
|
update the zot api (xchan store), plus a couple of typos
|
2018-07-19 17:14:37 -07:00 |
|
kostikov
|
f9b18aa62f
|
Update php2po.php
|
2018-07-20 00:22:04 +02:00 |
|
zotlabs
|
5d94cfba4a
|
Merge branch 'red'
|
2018-07-19 13:48:32 -07:00 |
|
zotlabs
|
0866cea72c
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-19 13:45:30 -07:00 |
|
zotlabs
|
6adbb93f0a
|
fix the filtered query string so it can potentially be re-used as is.
|
2018-07-19 13:42:57 -07:00 |
|
Mario Vavti
|
fe0e00f8f8
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-19 09:12:33 +02:00 |
|
zotlabs
|
b21d24e83e
|
fix delivery reports
|
2018-07-18 20:15:46 -07:00 |
|
zotlabs
|
13d19d42cb
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-18 19:14:21 -07:00 |
|
zotlabs
|
1829094e6a
|
styling
|
2018-07-18 18:57:20 -07:00 |
|
zotlabs
|
f8ed09b3fa
|
Merge branch 'red'
|
2018-07-18 18:55:28 -07:00 |
|
zotlabs
|
a757749be6
|
readme
|
2018-07-18 18:51:01 -07:00 |
|