 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 |
|
|
Mario
|
08e0f172de
|
Merge branch 'dev' into 'dev'
Remove unneccessary fetch_image_from_url() function
See merge request hubzilla/core!1393
|
2018-11-14 09:30:28 +01:00 |
|
|
zotlabs
|
cfc43f6dea
|
Merge branch 'master' into zvi
|
2018-11-13 20:37:52 -08:00 |
|
 DM42.Net (Matt Dent)
|
f1d168f781
|
Fix double escaping after xss fix
|
2018-11-13 23:06:00 -05:00 |
|
|
DM42.Net (Matt Dent)
|
ce8073d25e
|
Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix to search xss and Superblock fix.
|
2018-11-13 20:19:12 -05:00 |
|
|
zotlabs
|
31f4d9066b
|
xss in search
|
2018-11-13 14:23:56 -08:00 |
|
 Max Kostikov
|
cf2f7f2132
|
Update Photo.php
|
2018-11-13 12:52:35 +01:00 |
|
|
Max Kostikov
|
a145559662
|
Remove uneccessary include/photos.php
|
2018-11-13 11:45:18 +01:00 |
|
|
Max Kostikov
|
d029e3dc16
|
Text formatting in Photo.php
|
2018-11-13 11:39:42 +01:00 |
|
|
Max Kostikov
|
286326a98e
|
Replace fetch_image_from_url() with z_fetch_url()
|
2018-11-13 11:38:49 +01:00 |
|
|
Max Kostikov
|
b38ffef2be
|
Revert "Replace fetch_image_from_url() with z_fetch_url()"
This reverts commit 6375f2d73a
|
2018-11-13 11:25:46 +01:00 |
|
|
Max Kostikov
|
6375f2d73a
|
Replace fetch_image_from_url() with z_fetch_url()
|
2018-11-13 11:25:14 +01:00 |
|
|
zotlabs
|
1a2df9c51c
|
item uuid changes
|
2018-11-12 18:25:55 -08:00 |
|
|
zotlabs
|
770fdb2b7d
|
dreport updates
|
2018-11-12 16:08:22 -08:00 |
|
|
zotlabs
|
da452decf6
|
more z6 debugging
|
2018-11-11 15:12:01 -08:00 |
|
|
Max Kostikov
|
b57d296adc
|
Preserve photo modification date
|
2018-11-10 20:35:14 +01:00 |
|
|
Max Kostikov
|
f7b00c62a4
|
Remove unnecessary Zulu timezone mention
|
2018-11-10 10:05:28 +01:00 |
|
|
Max Kostikov
|
dc59561a95
|
Fixed timezone conversion
|
2018-11-09 22:17:11 +01:00 |
|
|
zotlabs
|
d56e1f6285
|
begin native summary support
|
2018-11-08 19:49:57 -08:00 |
|
|
zotlabs
|
22b3ddab66
|
refresh packets
|
2018-11-08 19:24:02 -08:00 |
|
|
Max Kostikov
|
dc0335d1d5
|
Correct "Content-Length:" calculation added
|
2018-11-08 11:53:27 +01:00 |
|
|
Mario Vavti
|
e0a0570cc4
|
$data only contains the link to the image if the image is in os storage. The size is calculatet wrong in this case and the download fails. rely on filesize from the db for content-length
|
2018-11-08 11:06:44 +01:00 |
|
|
Max Kostikov
|
3f6cd5a663
|
Disable image caching if personal or group permissions enabled
|
2018-11-07 19:52:38 +01:00 |
|
|
Max Kostikov
|
eaf117cce1
|
Added If-Modified-Since header support for better image caching and fixed absent 404 for photos
|
2018-11-07 18:22:55 +01:00 |
|
|
zotlabs
|
d2aa2c080f
|
Merge branch 'master' into zvi
|
2018-11-07 01:43:43 -08:00 |
|
|
Max Kostikov
|
a5a77d1e7c
|
Revert "remove 'Expiries' HTTP header"
This reverts commit 40d9277ef3
|
2018-11-07 08:41:32 +01:00 |
|
|
zotlabs
|
bb8b3b9291
|
this is brutal
|
2018-11-06 20:44:40 -08:00 |
|
|
Max Kostikov
|
40d9277ef3
|
remove 'Expiries' HTTP header
|
2018-11-06 16:22:34 +01:00 |
|
|
Max Kostikov
|
3491c488d3
|
Update Photo.php
|
2018-11-06 13:51:01 +01:00 |
|
|
Max Kostikov
|
1828b6daab
|
Update Photo.php
|
2018-11-06 13:41:41 +01:00 |
|
|
Max Kostikov
|
c26f45b7c2
|
Update Photo.php
|
2018-11-06 13:39:36 +01:00 |
|
|
Max Kostikov
|
e116b90116
|
'Last-Modified' and 'Content-Length' HTTP headers added for better image caching
|
2018-11-06 13:37:50 +01:00 |
|
|
Max Kostikov
|
f7ce374a28
|
Update Photo.php
|
2018-11-05 21:26:10 +01:00 |
|
|
Max Kostikov
|
2dd124d09e
|
Use modern get_config() syntax
|
2018-11-05 21:25:08 +01:00 |
|
|
Mario Vavti
|
b6938da552
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-05 09:56:52 +01:00 |
|
|
zotlabs
|
af82aab3a6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-11-04 13:58:02 -08:00 |
|
|
zotlabs
|
51b4b6216f
|
z6 updates to owa, linkinfo improved image detection
|
2018-11-04 13:56:32 -08:00 |
|
|
Mario Vavti
|
de32b0bba5
|
more fixes for forum notifications handling: do not count likes/dislikes if likes notifications are disabled and also do not show like activities when clicking a forum notification and like notifications are disabled
|
2018-11-03 20:53:23 +01:00 |
|
|
Max Kostikov
|
46b0510b99
|
Update Linkinfo.php
|
2018-11-03 10:41:31 +01:00 |
|
|
Max Kostikov
|
a7624ea48b
|
Update Linkinfo.php
|
2018-11-03 00:10:05 +01:00 |
|
|
Max Kostikov
|
2f3b4a7aaf
|
Update Linkinfo.php
|
2018-11-03 00:01:15 +01:00 |
|
|
Max Kostikov
|
a9bbe0b128
|
Update Linkinfo.php
|
2018-11-02 22:40:48 +01:00 |
|
|
Max Kostikov
|
0d9d0a4b70
|
more precise codepage detection
|
2018-11-02 22:37:53 +01:00 |
|
|
Max Kostikov
|
32c4614a32
|
Workaround for incorrect ISO-8859-5 encoded content conversion
|
2018-11-02 10:52:52 +01:00 |
|
|
Mike Macgirvin
|
7e1f431eca
|
yet another blueimp vulnerability. Move to composer.
|
2018-10-31 15:56:08 +11:00 |
|
|
zotlabs
|
70c55da1df
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-10-30 18:11:49 -07:00 |
|
|
zotlabs
|
623aa7ea48
|
remove primary/clone counts from admin summary. The last checkins should fix this count "eventually" but the information has little direct value and may require location information for a local channel to change before it is actually corrected.
|
2018-10-30 17:30:59 -07:00 |
|
|
Mario Vavti
|
1eac4db491
|
fix forum ping results - the term query requires xchan_name instead of xchan_hash. also improve the query itself - item_permission_sql() is redundant here since we always deal with local_channel() and use count(id) instead of sum(item_unseen) to get the unseen count
|
2018-10-29 23:01:13 +01:00 |
|
|
Mario Vavti
|
96bed3a623
|
fix issues with forum handling in mod network and ping. also some code cleanup.
|
2018-10-27 22:34:18 +02:00 |
|