zotlabs
|
32614e4074
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-29 18:00:56 -07:00 |
|
zotlabs
|
9dc5a3bfc9
|
this may conflict
|
2018-07-29 17:59:40 -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 |
|
Max Kostikov
|
cb4afd39bd
|
Workaround on possible error
|
2018-07-29 16:26:33 +02:00 |
|
Max Kostikov
|
e078caffd8
|
Update php2po.php
|
2018-07-29 14:20:01 +02:00 |
|
Max Kostikov
|
90a9febb6c
|
Workaround on possible error
|
2018-07-29 12:05:53 +02:00 |
|
Mario Vavti
|
e4a1286aae
|
fix sql empty query error in db update 1216
|
2018-07-29 08:05:41 +02:00 |
|
Mario
|
08a8011456
|
Merge branch 'patch-12' into 'dev'
Process msgctxt plurals
See merge request hubzilla/core!1246
|
2018-07-29 07:14:09 +02:00 |
|
Mario Vavti
|
643b6f0aa3
|
version
|
2018-07-29 07:00:30 +02:00 |
|
Mario Vavti
|
45d262d6c0
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-07-29 06:59:10 +02:00 |
|
Mario Vavti
|
5dbd11c6ed
|
wrong class name
|
2018-07-29 06:58:35 +02:00 |
|
Mario Vavti
|
3fcb6df0f1
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-29 06:43:55 +02:00 |
|
zotlabs
|
9701516228
|
fix unsanitised xchan_name
|
2018-07-28 17:17:12 -07:00 |
|
Max Kostikov
|
77dfe63d90
|
Process msgctxt plurals
|
2018-07-29 02:11:27 +02:00 |
|
zotlabs
|
2367d94a42
|
SECURITY: sanitise vcard fields
|
2018-07-28 15:33:20 -07:00 |
|
Mario
|
d85c849668
|
Merge branch 'patch-11' into 'dev'
Plural form strings export added
See merge request hubzilla/core!1245
|
2018-07-28 21:23:31 +02:00 |
|
Mario
|
cbd8c07265
|
Merge branch 'patch-9' into 'dev'
Respect navbar translations
See merge request hubzilla/core!1243
|
2018-07-28 21:22:51 +02:00 |
|
Mario
|
3a6d3cb396
|
Merge branch 'patch-8' into 'dev'
Fix navbar missed translations
See merge request hubzilla/core!1242
|
2018-07-28 21:22:12 +02:00 |
|
Mario
|
6e52f552cf
|
Merge branch 'patch-7' into 'dev'
Russian translation update
See merge request hubzilla/core!1241
|
2018-07-28 21:20:01 +02:00 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
zotlabs
|
ecc9da2c1e
|
resolve zotfinger looping on malformed input
|
2018-07-25 19:56:24 -07:00 |
|
kostikov
|
b0c8e75c6e
|
Fix duplicate transport displaying
|
2018-07-25 22:28:21 +02: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 |
|