harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,640 Commits 6 Branches 36 Tags
cfc43f6dea22c4c23ed485a7b321de76515f584d
Commit Graph
22640 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs cfc43f6dea Merge branch 'master' into zvi 2018-11-13 20:37:52 -08:00
zotlabs ee85784be1 stay ahead of the game 2018-11-13 19:55:43 -08:00
M. Dent 1260887fa7 Merge branch 'patch-20181113a' into 'dev' 
Patch 20181113a

See merge request hubzilla/core!1394
 2018-11-14 03:21:32 +01: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
DM42.Net (Matt Dent) 35e66770be Filter search box before display 2018-11-13 17:20:21 -05:00
Max Kostikov adf4782076 Merge branch 'revert-6375f2d7' into 'dev' 
Revert "Replace fetch_image_from_url() with z_fetch_url()"

See merge request hubzilla/core!1392
 2018-11-13 11:36:02 +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
M. Dent a7d3a49171 Merge branch 'fix-activity-filter-widget' into 'dev' 
use the correct javascript function for this case

See merge request hubzilla/core!1390
 2018-11-12 21:50:08 +01:00
M. Dent 920e7db709 Merge branch 'css-fixes' into 'dev' 
css fixes

See merge request hubzilla/core!1391
 2018-11-12 21:49:07 +01:00
zotlabs 4a6b45cf04 enotify::format hook for superblock 2018-11-12 11:13:36 -08:00
Mario Vavti 7bd60adfbe fix css issues in bbcode conversion and focus-light schema 2018-11-12 09:35:12 +01:00
zotlabs 171ff54ea4 translate zot message packets to zot6 for delivery 2018-11-11 21:55:10 -08:00
zotlabs da452decf6 more z6 debugging 2018-11-11 15:12:01 -08:00
Mario Vavti c335719e8f use the correct javascript function for this case 2018-11-11 14:46:35 +01:00
Mario Vavti d57cdf645e Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-11-11 14:01:25 +01:00
Mario e47a96bf24 Merge branch 'dev' into 'dev' 
Preserve photo modification date on edit

See merge request hubzilla/core!1389
 2018-11-11 13:49:29 +01:00
Mario daad607c7c Merge branch 'dev' into 'dev' 
fix shared_header img expanding to 100% width when sharing a share

See merge request hubzilla/core!1387
 2018-11-11 13:47:03 +01:00
Max Kostikov 29f1f9c872 Merge branch 'dev' into 'dev' 
# Conflicts:
#   include/photo/photo_driver.php
 2018-11-10 20:47:35 +01:00
Max Kostikov a49cfa8142 Update photo_driver.php 2018-11-10 20:45:20 +01:00
Max Kostikov b57d296adc Preserve photo modification date 2018-11-10 20:35:14 +01:00
Mario 01d8bd445e Merge branch 'dev' into 'dev' 
Remove DNS check for database connection during installation...

See merge request hubzilla/core!1384
 2018-11-10 15:02:27 +01:00
Mario Vavti 750d6f4be9 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-11-10 12:22:09 +01:00
Max Kostikov c6e14a696e Fixed wrong value assign on compare with 0 2018-11-10 11:56:34 +01:00
Max Kostikov d34423fce9 Fixed wrong value assign on compare with 0 2018-11-10 11:53:49 +01:00
Mario 4999547f87 Merge branch 'dev' into 'dev' 
Preserve received image modification date on caching

See merge request hubzilla/core!1386
 2018-11-10 11:47:20 +01:00
Mario Vavti fc5dc9717a fix shared_header img expanding to 100% width when sharing a share 2018-11-10 11:31:06 +01:00
Max Kostikov d20759c141 Do not return default images from vCard 2018-11-10 11:11:23 +01:00
Max Kostikov f7b00c62a4 Remove unnecessary Zulu timezone mention 2018-11-10 10:05:28 +01:00
Max Kostikov 32873ce70d Preserve received image modification date on caching 2018-11-09 22:20:41 +01:00
Max Kostikov dc59561a95 Fixed timezone conversion 2018-11-09 22:17:11 +01:00
Mario 4bf3fdd898 Merge branch 'patch-1' into 'dev' 
Return image modification date on remote fetch for caching

See merge request hubzilla/core!1383
 2018-11-09 16:51:36 +01:00
Andrew Manning 108a892a11 Remove DNS check for database connection during installation. Causes friction with Docker deployment. 2018-11-09 05:31:55 -05:00
Max Kostikov 2c4bd9a3fe Workaround for local resource path to photo from Diaspora 2018-11-09 10:03:58 +01:00
zotlabs c80ac58eff add zot6 delivery method 2018-11-08 20:42:09 -08: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
zotlabs 3fe2491b73 didn't need xchan_portable_id 2018-11-08 15:53:48 -08:00
zotlabs 4e6758e31d item db updates 2018-11-08 15:51:52 -08:00
Max Kostikov 098ec1abb4 remove image type double guess by checking HTTP headers 2018-11-08 22:43:17 +01:00
Max Kostikov 17cf824545 Return image modification date using HTTP 'Last-Modified' and '304 Not Modified' on remote fetch for caching 2018-11-08 18:00:18 +01:00
M. Dent e35f5d3c93 Merge branch 'fix-photo' into 'dev' 
Fix photo

See merge request hubzilla/core!1382
 2018-11-08 13:09:05 +01:00
Mario f4f98e5856 Merge branch 'patch-1' into 'fix-photo' 
Correct "Content-Length:" calculation added

See merge request mario/core!1
 2018-11-08 12:13:00 +01:00
Max Kostikov dc0335d1d5 Correct "Content-Length:" calculation added 2018-11-08 11:53:27 +01:00
M. Dent 6013814cf4 Merge branch 'fix-photo' into 'dev' 
$data only contains the link to the image if the image is in os storage. The…

See merge request hubzilla/core!1379
 2018-11-08 11:25:36 +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
Mario 61deb4fcfd Merge branch 'patch-1' into 'dev' 
Disable image caching if personal or group permissions enabled

See merge request hubzilla/core!1377
 2018-11-08 10:25:11 +01:00