Commit Graph

23724 Commits

Author SHA1 Message Date
Mario
07fd2dbc99 Merge branch 'dev' into 'dev'
Update Russian translation

See merge request hubzilla/core!1400
2018-11-20 11:08:27 +01:00
Mario Vavti
f8a8559523 fix typo which prevented propagation of comments
(cherry picked from commit 0c94747ab1)
2018-11-20 10:09:46 +01:00
zotlabs
6481c9dca1 use this form instead 2018-11-19 15:20:28 -08:00
zotlabs
7aaa1973f4 push recent changes 2018-11-19 15:04:08 -08:00
Max Kostikov
4dea1b5a0d Replace hmessages.po 2018-11-19 13:52:31 +01:00
Max Kostikov
da44ab0529 Replace hstrings.php 2018-11-19 13:51:54 +01:00
Mario
73b836c73d Revert "Fix return on wrong sotred in Content-Length size for full size photos"
This reverts commit 6010b5c619
2018-11-19 13:11:18 +01:00
Mario
af0c2f59cc Revert "Add filesize for streaming content"
This reverts commit 238a616292
2018-11-19 13:11:04 +01:00
Mario Vavti
1044e8e91a version 3.8.5 2018-11-19 11:12:32 +01:00
Mario Vavti
dffc0a4ed8 changelog
(cherry picked from commit 5cb4cdaa5e)
2018-11-19 11:11:47 +01:00
Mario Vavti
ba4b1cb5af Merge branch 'master' of https://framagit.org/hubzilla/core 2018-11-19 11:10:36 +01:00
Mario Vavti
5cb4cdaa5e changelog 2018-11-19 11:10:22 +01:00
Mario Vavti
0525eb2d29 update sql schemas to include update column in pconfig table
(cherry picked from commit ae97649948)
2018-11-19 10:45:33 +01:00
Mario
7be1d9e45a Merge branch 'patch-20181118a' into 'dev'
Patch 20181118a - fix delayed publication of posts

See merge request hubzilla/core!1398

(cherry picked from commit f34af496ec)

3787c490 Fix: delayed items propagate before publication on cloned channels
2018-11-19 10:45:01 +01:00
Mario
f34af496ec Merge branch 'patch-20181118a' into 'dev'
Patch 20181118a - fix delayed publication of posts

See merge request hubzilla/core!1398
2018-11-19 10:44:41 +01:00
Mario Vavti
ae97649948 update sql schemas to include update column in pconfig table 2018-11-19 10:42:18 +01:00
DM42.Net (Matt Dent)
3787c490d4 Fix: delayed items propagate before publication on cloned channels 2018-11-18 07:00:06 -05:00
Max Kostikov
c3f1aae570 Merge branch 'mod-zot-fix' into 'dev'
fix typo which prevented propagation of comments

See merge request hubzilla/core!1399
2018-11-18 11:21:07 +01:00
Mario Vavti
0c94747ab1 fix typo which prevented propagation of comments 2018-11-18 11:02:01 +01:00
Mario Vavti
783cca1e13 recalculate photo filesize when rotating an image
(cherry picked from commit f15e32d063)
2018-11-17 09:51:28 +01:00
Mario Vavti
f15e32d063 recalculate photo filesize when rotating an image 2018-11-17 09:41:26 +01:00
Max Kostikov
238a616292 Add filesize for streaming content 2018-11-16 23:33:45 +01:00
Max Kostikov
6010b5c619 Fix return on wrong sotred in Content-Length size for full size photos 2018-11-16 23:14:10 +01:00
Mario Vavti
4812c5486d strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead.
(cherry picked from commit afc75af62f)
2018-11-16 22:19:01 +01:00
Mario Vavti
afc75af62f strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead. 2018-11-16 22:14:11 +01:00
Mario
23b30fdd10 Merge branch 'dev_homeinstall_raspihub' into 'dev'
localhost, URLs, version updates

See merge request hubzilla/core!1396
2018-11-16 11:30:53 +01:00
Mario
2778a7220f Merge branch 'master' into 'master'
delivery issue

See merge request hubzilla/core!1397
2018-11-16 10:29:45 +01:00
Mario Vavti
c69556f2ff Merge remote-tracking branch 'mike/master' into dev 2018-11-16 10:11:46 +01:00
zotlabs
b0689614bf datetime_convert wrong args 2018-11-15 21:14:14 -08:00
zotlabs
e42a401987 more work on the mid/uuid conversion 2018-11-15 20:50:47 -08:00
zotlabs
5162459e4a delivery report issue 2018-11-15 18:07:58 -08:00
zotlabs
39d914c9df add item.uuid to relevant places 2018-11-15 16:34:09 -08:00
zotlabs
8d2f4d9dfd mid -> uuid conversions for basic reactions 2018-11-15 16:02:29 -08:00
zotlabs
a7d2f9b530 remove checkjs and nojs 2018-11-15 15:35:06 -08:00
zotlabs
26f593afaa delivery issue 2018-11-15 13:52:25 -08:00
Mario Vavti
ca4e7f9b4f fix update 1228 2018-11-15 10:11:04 +01:00
zotlabs
b11858bcac separate by network 2018-11-14 20:34:00 -08:00
zotlabs
034f23b47e update httpsig unit test which is failing 2018-11-14 19:09:18 -08:00
zotlabs
9c25f300cf fixes to old z6 delivery 2018-11-14 18:56:38 -08:00
zotlabs
db4ff56f0b more logging 2018-11-14 18:41:36 -08:00
zotlabs
830c2472cb more logging 2018-11-14 18:39:23 -08:00
zotlabs
079e2af0c0 check keyid 2018-11-14 18:33:00 -08:00
zotlabs
5f166158c3 filter by network 2018-11-14 18:25:02 -08:00
zotlabs
4a06378d67 crypto fix 2018-11-14 18:19:35 -08:00
zotlabs
d0f0a74df8 encrypted header issue 2018-11-14 18:14:47 -08:00
zotlabs
65a8965e85 extra logging 2018-11-14 18:07:39 -08:00
zotlabs
ab2376f8d8 fix dreport link 2018-11-14 17:42:02 -08:00
zotlabs
48717dff00 change db update counter 2018-11-14 16:56:07 -08:00
zotlabs
b64dd7ab57 Merge branch 'master' into zvi 2018-11-14 16:42:03 -08:00
zotlabs
bf013ecf00 db updates for zot6 2018-11-14 16:40:30 -08:00