Mario Vavti
|
c771d2809f
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-14 10:28:55 +01:00 |
|
zotlabs
|
fc78206049
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-12-13 16:13:13 -08:00 |
|
zotlabs
|
6464099364
|
regression: the ability to order apps messed up since adding pinned apps to the ordering
|
2018-12-12 19:11:30 -08:00 |
|
Mario Vavti
|
993db01400
|
return on readImageBlob() exception
|
2018-12-11 12:21:09 +01:00 |
|
Mario Vavti
|
15a689c6f5
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-10 10:38:06 +01:00 |
|
zotlabs
|
214b81e491
|
rmagic discovery for z6 networks
|
2018-12-09 16:37:15 -08:00 |
|
Max Kostikov
|
d12744011a
|
Merge branch 'dev' into 'dev'
Add strings to Russian translation
See merge request hubzilla/core!1418
|
2018-12-04 11:50:04 +01:00 |
|
zotlabs
|
ffc3dba682
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-12-03 19:19:31 -08:00 |
|
zotlabs
|
7d694dca07
|
more work on z6 commenting
|
2018-12-03 18:50:45 -08:00 |
|
Mario Vavti
|
c50e3a702a
|
more notifications fixes
(cherry picked from commit 9ef6c57ca5)
|
2018-12-03 10:49:08 +01:00 |
|
Mario Vavti
|
2173ef5fb6
|
catch exception if readImageBlob() receives bogus data
(cherry picked from commit 443d7684db)
|
2018-12-03 10:48:39 +01:00 |
|
Max Kostikov
|
1f6da1c653
|
Merge branch 'photocache' into 'dev'
Add flag to allow to save image without validation
See merge request hubzilla/core!1416
|
2018-12-03 00:57:52 +01:00 |
|
Max Kostikov
|
c165894ce9
|
Add Expires field support
|
2018-12-03 00:51:09 +01:00 |
|
Max Kostikov
|
19903ea3c1
|
Add flag to allow to save image without validation
|
2018-12-02 21:59:08 +01:00 |
|
M. Dent
|
0b38ab259c
|
Merge branch 'photocache' into 'dev'
Add Photo Cache addon support
See merge request hubzilla/core!1412
|
2018-12-02 19:33:54 +01:00 |
|
Max Kostikov
|
2a57e00cb4
|
Remove local_channel() check on cache_body_hook call
|
2018-12-02 10:07:12 +01:00 |
|
M. Dent
|
52424b0f9c
|
Merge branch 'pdf_embed_fixes' into 'dev'
make pdf preview 100% width and 300px height to match it openstreetmaps preview
See merge request hubzilla/core!1414
|
2018-12-02 05:09:45 +01:00 |
|
Mario Vavti
|
fdb0459288
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-01 21:43:54 +01:00 |
|
Mario Vavti
|
df84352385
|
make pdf preview 100% width and 300px height to match it openstreetmaps preview
|
2018-12-01 21:37:33 +01:00 |
|
zotlabs
|
6cade7d935
|
attached photo permissions regression
|
2018-11-30 13:54:17 -08:00 |
|
Max Kostikov
|
c857ecab46
|
Create plink depending on message id format
|
2018-11-30 19:56:49 +01:00 |
|
Max Kostikov
|
53d9cbc69c
|
Check local_channel() before cache call
|
2018-11-30 11:38:47 +01:00 |
|
Max Kostikov
|
0ee403eab3
|
Move cache code to addon
|
2018-11-30 10:50:00 +01:00 |
|
Max Kostikov
|
6f2d09eb20
|
Fix wrong parameter
|
2018-11-29 23:28:45 +01:00 |
|
Max Kostikov
|
d6442ec991
|
Update text.php
|
2018-11-29 23:07:39 +01:00 |
|
Max Kostikov
|
3265c2e543
|
Skip sslify for images if it already were cached with https enabled
|
2018-11-29 20:36:21 +01:00 |
|
Max Kostikov
|
1a9ea64523
|
Update text.php
|
2018-11-29 19:28:54 +01:00 |
|
Max Kostikov
|
9de650e175
|
Cache for viewer channel
|
2018-11-29 19:13:43 +01:00 |
|
Max Kostikov
|
d8b5f383f5
|
Disable links to cached photos for non logged viewers
|
2018-11-29 16:21:50 +01:00 |
|
Max Kostikov
|
d9faf6c4bb
|
Update text.php
|
2018-11-29 11:48:12 +01:00 |
|
Max Kostikov
|
48cd5855fe
|
Add photo cache support using sslify()
|
2018-11-29 11:06:14 +01:00 |
|
zotlabs
|
19e4f3c2f0
|
prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
|
2018-11-27 11:53:02 -08:00 |
|
Mario
|
f408ff982c
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-23 15:42:40 +01:00 |
|
zotlabs
|
9a8d1200ec
|
use uuid in file storage
|
2018-11-22 18:39:38 -08:00 |
|
Mario
|
85f52d2aed
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-22 10:17:18 +01:00 |
|
zotlabs
|
8e71324514
|
fix mastodon tag notifications (again)
|
2018-11-21 20:25:59 -08:00 |
|
zotlabs
|
ea235c0c67
|
no mention notifications from mastodon (and pleroma)
|
2018-11-21 20:03:58 -08:00 |
|
DM42.Net (Matt Dent)
|
3787c490d4
|
Fix: delayed items propagate before publication on cloned channels
|
2018-11-18 07:00:06 -05: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 |
|
zotlabs
|
b0689614bf
|
datetime_convert wrong args
|
2018-11-15 21:14:14 -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
|
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
|
b64dd7ab57
|
Merge branch 'master' into zvi
|
2018-11-14 16:42:03 -08:00 |
|
Mario
|
6ed9443972
|
Merge branch 'patch-20181113b' into 'dev'
Patch 20181113b
See merge request hubzilla/core!1395
|
2018-11-14 09:30:54 +01:00 |
|