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 |
|
Mario Vavti
|
237c6eed50
|
fallback to url if we have not got an addr
(cherry picked from commit a3ba7f0788)
|
2018-12-02 11:39:04 +01:00 |
|
Mario Vavti
|
f13b1e8604
|
fix filtering by addr in handleNotificationsItems()
(cherry picked from commit f083c0cba1)
|
2018-12-02 10:59:33 +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 |
|
M. Dent
|
132547a9d9
|
Merge branch 'sticky_aside_fixes' into 'dev'
redbasic sticky aside fixes
See merge request hubzilla/core!1415
|
2018-12-02 05:07:59 +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 |
|
Mario Vavti
|
8d4f6a7865
|
redbasic sticky aside fixes
|
2018-12-01 21:30:18 +01:00 |
|
zotlabs
|
6f22e47feb
|
typo
|
2018-11-30 22:39:10 -08:00 |
|
zotlabs
|
c6acb6191c
|
allow notification filtering by name or addr
|
2018-11-30 19:03:14 -08:00 |
|
zotlabs
|
6cade7d935
|
attached photo permissions regression
|
2018-11-30 13:54:17 -08: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
|
f3831fa77f
|
Better cache settings logic
|
2018-11-29 21:27:06 +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
|
6aa99a903f
|
Code cleanup
|
2018-11-29 11:56:56 +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 |
|
Max Kostikov
|
bd0fc8a2d7
|
Add photo cache hooks
|
2018-11-29 10:38:25 +01:00 |
|
Max Kostikov
|
476bd7400d
|
Add photo cache cleanup
|
2018-11-29 10:37:39 +01:00 |
|
Max Kostikov
|
bd10d48338
|
Update database with expires field for photo
|
2018-11-29 10:36:56 +01:00 |
|
Max Kostikov
|
bb91064416
|
Add expires for photo
|
2018-11-29 10:35:56 +01:00 |
|
Max Kostikov
|
72d2fe2fd4
|
Add expires for photo
|
2018-11-29 10:35:11 +01:00 |
|
Max Kostikov
|
92a5b9ac41
|
Add PHOTO_CACHE photo type
|
2018-11-29 10:34:18 +01:00 |
|
M. Dent
|
cded6b1136
|
Merge branch 'es-es' into 'dev'
Revision 1 doc/es-es/about/about.bb
See merge request hubzilla/core!1410
|
2018-11-28 05:32:10 +01:00 |
|
M. Dent
|
19f0ce7e37
|
Merge branch 'default2flex-conversion' into 'dev'
use flex for the default template
See merge request hubzilla/core!1409
|
2018-11-28 04:03:39 +01:00 |
|
M. Dent
|
a88a515fa0
|
Merge branch 'composer-updates' into 'dev'
update jquery-file-upload and psr-log via composer
See merge request hubzilla/core!1408
|
2018-11-28 03:55:13 +01:00 |
|
M. Dent
|
a4b2eac0f0
|
Merge branch 'update-imagesloaded' into 'dev'
update imagesloaded to version 4.1.4 via composer
See merge request hubzilla/core!1407
|
2018-11-28 03:52:53 +01:00 |
|
M. Dent
|
0bd38290e6
|
Merge branch 'pg-fixes' into 'dev'
fix db upgrade 1228 for postgres
See merge request hubzilla/core!1403
|
2018-11-28 03:49:22 +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 |
|
Manuel Jiménez Friaza
|
8bede7b81f
|
Merge branch 'cherry-pick-5ac08ec3' into 'es-es'
Revision 1 doc/es-es/about/about.bb
See merge request mjfriaza/core!3
|
2018-11-26 12:59:03 +01:00 |
|
Manuel Jiménez Friaza
|
37d563c30e
|
Revision 1 doc/es-es/about/about.bb
(cherry picked from commit 5ac08ec3aa)
|
2018-11-26 12:53:24 +01:00 |
|
Mario
|
3775be4ce9
|
use flex for the default template
|
2018-11-26 12:44:10 +01:00 |
|
Mario
|
e5883dd605
|
Merge branch 'patch-20181120a' into 'dev'
Do not store serialized pconfig value received via to Module/Pconfig.php
See merge request hubzilla/core!1402
|
2018-11-25 10:22:09 +01:00 |
|
M. Dent
|
6b02c664fb
|
Do not store serialized pconfig value received via to Module/Pconfig.php
|
2018-11-25 10:22:09 +01:00 |
|
Mario
|
c7ae3fdc9a
|
update jquery-file-upload and psr-log via composer
|
2018-11-25 10:18:26 +01:00 |
|
Mario
|
c667572d3e
|
update imagesloaded to version 4.1.4 via composer
|
2018-11-25 10:09:26 +01:00 |
|
Mario
|
9bbd6ff67d
|
Merge branch 'es-es' into 'dev'
Update es-es
See merge request hubzilla/core!1406
|
2018-11-24 21:16:59 +01:00 |
|
Manuel Jiménez Friaza
|
ca98a566ee
|
Update es-es
|
2018-11-24 13:23:20 +01:00 |
|
Manuel Jiménez Friaza
|
f865d6e5da
|
Resolved merge conflicts
|
2018-11-24 13:01:01 +01:00 |
|
Mario
|
bc9f2922e0
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-23 22:04:51 +01:00 |
|
zotlabs
|
c5a9b00eae
|
Organization actor type was missing
|
2018-11-23 12:25:05 -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 |
|