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 |
|
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)
|
302d9796c4
|
Revert "Filter search box before display"
This reverts commit 35e66770be.
|
2018-11-13 22:59:36 -05:00 |
|
zotlabs
|
ee85784be1
|
stay ahead of the game
|
2018-11-13 19:55:43 -08: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 |
|
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 |
|
Mario Vavti
|
7bd60adfbe
|
fix css issues in bbcode conversion and focus-light schema
|
2018-11-12 09:35:12 +01:00 |
|
zotlabs
|
da452decf6
|
more z6 debugging
|
2018-11-11 15:12:01 -08: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 |
|
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 |
|
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 |
|
zotlabs
|
d2aa2c080f
|
Merge branch 'master' into zvi
|
2018-11-07 01:43:43 -08:00 |
|
zotlabs
|
7148311953
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-11-07 01:43:26 -08: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
|
a5483a03c9
|
fix signatures
|
2018-11-06 21:44:57 -08:00 |
|
zotlabs
|
bb8b3b9291
|
this is brutal
|
2018-11-06 20:44:40 -08:00 |
|
zotlabs
|
3b9aedec5f
|
populate new fields
|
2018-11-05 19:52:30 -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 |
|