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 |
|
zotlabs
|
67848c03ed
|
query filter was a bit greedy
(cherry picked from commit a05c8ff66b)
|
2018-07-19 09:21:14 +02:00 |
|
Mario
|
685d05f98b
|
Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'
mangled urls on redirects
See merge request hubzilla/core!1228
|
2018-07-19 09:20:45 +02:00 |
|
zotlabs
|
931afe98b1
|
mangled urls on redirects
(cherry picked from commit 5ce50d0a2e)
|
2018-07-19 09:19:33 +02:00 |
|
Mario Vavti
|
fe0e00f8f8
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-19 09:12:33 +02:00 |
|
zotlabs
|
13d19d42cb
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-18 19:14:21 -07:00 |
|
zotlabs
|
ec852b0c8d
|
typo
|
2018-07-18 17:51:10 -07:00 |
|
zotlabs
|
a05c8ff66b
|
query filter was a bit greedy
|
2018-07-18 17:48:23 -07:00 |
|
zotlabs
|
5ce50d0a2e
|
mangled urls on redirects
|
2018-07-18 17:05:38 -07:00 |
|
Mario Vavti
|
dfbdeafa39
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-18 20:59:45 +02:00 |
|
Mario Vavti
|
4a6f775334
|
set the correct album name when moving photos
(cherry picked from commit eb322e8312)
|
2018-07-18 13:20:20 +02:00 |
|
Mario Vavti
|
5fa3e10701
|
set the correct album name when moving photos
(cherry picked from commit eb322e8312)
|
2018-07-18 13:19:35 +02:00 |
|
Mario Vavti
|
eb322e8312
|
set the correct album name when moving photos
|
2018-07-18 13:18:37 +02:00 |
|
Mario Vavti
|
c2e819771f
|
version 3.7
|
2018-07-18 11:56:26 +02:00 |
|