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
091ef33f18
Merge branch 'patch-2' into 'dev'
...
Escape internal quotes in translation on export
See merge request hubzilla/core!1237
(cherry picked from commit 84e57d040b64efd07f87857fe53342fc22
2018-07-23 19:55:25 +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
kostikov
64efd07f6b
Escape internal quotes in translation on export
2018-07-22 19:39:53 +02:00
Mario Vavti
aa01c2f4db
update changelog
...
(cherry picked from commit 6be66d6df9
2018-07-21 22:08:12 +02:00
Mario Vavti
6be66d6df9
update changelog
2018-07-21 22:01:59 +02:00
kostikov
740015339d
Add var to respect current hstrings.php format
...
(cherry picked from commit 062633d312
2018-07-21 11:39:20 +02:00
kostikov
b7778ca1f9
Update php2po.php
...
(cherry picked from commit f9b18aa62f
2018-07-21 11:38:35 +02:00
kostikov
ddd77ee6ee
Update update_fail_eml.tpl
...
(cherry picked from commit 8fc7f2aca1
2018-07-21 11:37:27 +02:00
kostikov
b625b5f645
Update register_verify_eml.tpl
...
(cherry picked from commit b6c2c8117e
2018-07-21 11:36:58 +02:00
kostikov
c9e272a78d
Update register_open_eml.tpl
...
(cherry picked from commit 86a42aad16
2018-07-21 11:35:30 +02:00
kostikov
9bfb63fd98
Update passchanged_eml.tpl
...
(cherry picked from commit 8e2e09bb16
2018-07-21 11:35:07 +02:00
kostikov
21ecf54b73
Update lostpass_eml.tpl
...
(cherry picked from commit 3713aa210f
2018-07-21 11:34:42 +02:00
kostikov
429e3ce30a
Add new file
...
(cherry picked from commit a65c23546b
2018-07-21 11:34:14 +02:00
kostikov
26e20d35c2
Update hstrings.php
...
(cherry picked from commit 790a9155d4
2018-07-21 11:32:57 +02:00
kostikov
f40406514c
Update hmessages.po
...
(cherry picked from commit f141b845fd
2018-07-21 11:32:33 +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
ed79bef51b
prevent double file uploads when dropping files into jot
...
(cherry picked from commit f6de91bf0f
2018-07-20 16:45:50 +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
0cde7f9897
fix jot drag and drop
...
(cherry picked from commit c72f6e6ea8
2018-07-20 10:43:38 +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
85e21ce617
checkjs fix ($page not bin-hex in all cases)
...
(cherry picked from commit a94c9d2709
2018-07-20 09:16:35 +02:00
zotlabs
157a9e895c
fix the filtered query string so it can potentially be re-used as is.
...
(cherry picked from commit 6adbb93f0a
2018-07-20 09:16:09 +02:00
zotlabs
a94c9d2709
checkjs fix ($page not bin-hex in all cases)
2018-07-19 17:19:19 -07:00
kostikov
f9b18aa62f
Update php2po.php
2018-07-20 00:22:04 +02: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
7e2635adfe
RC1
2018-07-19 12:27:43 +02:00
Mario
b655d04b34
version 3.4.2
2018-07-19 11:57:35 +02:00
Mario
7f84933cab
compatibility fix for future versions
2018-07-19 11:52:12 +02:00
zotlabs
36220fdde8
typo
...
(cherry picked from commit ec852b0c8d
2018-07-19 09:21:35 +02:00
