Mario
|
973114caf6
|
Merge branch 'patch-6' into 'dev'
Fix duplicate transport displaying
See merge request hubzilla/core!1240
|
2018-07-28 21:19:40 +02:00 |
|
Max Kostikov
|
e27e0ca198
|
Plural form strings export added
|
2018-07-28 17:36:48 +02:00 |
|
Mario Vavti
|
27329e39e4
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-28 09:33:17 +02: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 |
|
Max Kostikov
|
05b3237bae
|
Update nav.php
|
2018-07-27 11:50:04 +02:00 |
|
Max Kostikov
|
4fd9d1ee5f
|
Update Apps.php
|
2018-07-27 11:29:38 +02:00 |
|
Max Kostikov
|
0fe7004d38
|
Update Apps.php
|
2018-07-27 11:03:02 +02:00 |
|
Max Kostikov
|
06b0dbdfba
|
Update hstrings.php
|
2018-07-26 12:21:33 +02:00 |
|
Max Kostikov
|
48fb3d3653
|
Update hmessages.po
|
2018-07-26 12:20:53 +02:00 |
|
Max Kostikov
|
baa5fd9739
|
Update passchanged_eml.tpl
|
2018-07-26 12:19:59 +02:00 |
|
Max Kostikov
|
e01c277c56
|
Update lostpass_eml.tpl
|
2018-07-26 12:18:54 +02:00 |
|
Mario Vavti
|
ec3a066e4e
|
fix sql error
|
2018-07-26 09:32:52 +02:00 |
|
kostikov
|
b0c8e75c6e
|
Fix duplicate transport displaying
|
2018-07-25 22:28:21 +02: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 |
|
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
|
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
|
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 |
|