harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,616 Commits 6 Branches 36 Tags 152 MiB
04a2dc075f
Commit Graph

7687 Commits

Author SHA1 Message Date
Mario
04a2dc075f manualy remove scale_external_images() due to merge conflicts 2018-12-22 20:08:44 +01:00
Max Kostikov
01448c152c Remove scale_external_images() 
(cherry picked from commit 1541f67eab)
 2018-12-22 20:04:09 +01:00
Max Kostikov
a09beb3833 Remove scale_external_images() 
(cherry picked from commit a2959c6e9e)
 2018-12-22 20:03:49 +01:00
phani00
4d47b098e5 remove some fancy formatting. 
(cherry picked from commit aaab905e72)
 2018-12-22 19:54:11 +01:00
phani00
66b56416b6 new fix for dark theme 
change implementation of hl-tags in include/bbcode.php
insert class='default-highlight' instead of background-color: 'yellow' into span
add span.default-highlight definition to view/theme/redbasic/css/style.css

this works for all schemas incl. dark.


(cherry picked from commit aace8a14ce)
 2018-12-22 19:52:39 +01:00
zotlabs
06c71eec65 default curl to http/1.1 
(cherry picked from commit 04a45a407e)
 2018-12-17 12:17:44 +01:00
zotlabs
c2ad9d4996 regression: the ability to order apps messed up since adding pinned apps to the ordering 
(cherry picked from commit 6464099364)
 2018-12-14 21:31:02 +01:00
Mario Vavti
ad4b18cbbe return on readImageBlob() exception 
(cherry picked from commit 993db01400)
 2018-12-14 11:31:11 +01:00
Mario Vavti
9fcadc2d7c prevent incompatible export files (osada/zap) from being imported (manual patch from dev) 2018-12-03 11:08:39 +01:00
Mario Vavti
9ef6c57ca5 more notifications fixes 2018-12-03 10:46:49 +01:00
Mario Vavti
443d7684db catch exception if readImageBlob() receives bogus data 2018-12-03 10:45:43 +01:00
Mario Vavti
defa2d9df1 make pdf preview 100% width and 300px height to match it openstreetmaps preview 
(cherry picked from commit df84352385)
 2018-12-02 10:18:37 +01:00
zotlabs
4bf3d4d87a attached photo permissions regression 
(cherry picked from commit 6cade7d935)
 2018-12-02 10:17:29 +01:00
zotlabs
4010ea814a fix mastodon tag notifications (again) 
(cherry picked from commit 8e71324514)
 2018-12-02 10:13:12 +01:00
zotlabs
8e25c091f4 no mention notifications from mastodon (and pleroma) 
(cherry picked from commit ea235c0c67)
 2018-12-02 10:12:44 +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 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
zotlabs
26f593afaa delivery issue 2018-11-15 13:52:25 -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
DM42.Net (Matt Dent)
302d9796c4 Revert "Filter search box before display" 
This reverts commit 35e66770be.
 2018-11-13 22:59:36 -05:00
DM42.Net (Matt Dent)
35e66770be Filter search box before display 2018-11-13 17:20:21 -05:00
Max Kostikov
2f59d78737 Remove fetch_image_from_url() because of functions duplicate 2018-11-13 11:37:32 +01:00
Mario Vavti
7bd60adfbe fix css issues in bbcode conversion and focus-light schema 2018-11-12 09:35:12 +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
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
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
Max Kostikov
d20759c141 Do not return default images from vCard 2018-11-10 11:11:23 +01:00
Max Kostikov
32873ce70d Preserve received image modification date on caching 2018-11-09 22:20:41 +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
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
Mario Vavti
302f49baf2 provide a function to log to syslog 2018-11-08 10:12:33 +01:00
Mario Vavti
c23dfa0d23 Merge remote-tracking branch 'mike/master' into dev 2018-11-07 10:15:40 +01:00
zotlabs
f57fcefe6b signature issue 2018-11-06 21:45:43 -08:00
zotlabs
43a5f928ba these changes needed to ensure cloning/syncing works in the future to non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch 2018-11-05 16:57:32 -08:00
Mario
d6523c67a6 Merge branch 'patch-20181028a' into 'dev' 
Add timestamp to pconfig

See merge request hubzilla/core!1355
 2018-11-05 10:40:29 +01:00
M.Dent
346a4f5933 strpos needs to test with ===0 not ==0 2018-11-01 20:23:22 -04:00
Max Kostikov
c6551336c8 Fix wrong image resize for some external images 2018-11-01 21:50:36 +01:00
Mario Vavti
0252bac4ba Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-10-31 09:39:10 +01:00
Mario
b468069875 Merge branch 'patch-20' into 'dev' 
Beautiful embedding for Hubzilla links

See merge request hubzilla/core!1360
 2018-10-31 09:36:09 +01:00
zotlabs
70c55da1df Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-10-30 18:11:49 -07:00
zotlabs
9594105e57 typo 2018-10-30 17:21:39 -07:00
zotlabs
675343f575 issue syncing the channel_primary setting which shows up as a wrong count on the admin summary page 2018-10-30 17:18:15 -07:00
Mario Vavti
b4bac88c39 fix markdown tests 2018-10-30 22:37:41 +01:00
Mario Vavti
c622ba84b9 really fix html2markdown() - when using environment, we must set the defaults 2018-10-30 22:16:37 +01:00