harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,193 Commits 6 Branches 36 Tags 152 MiB
8559334339
Commit Graph

24193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti
9450305568 changelog 
(cherry picked from commit 08725c44c6)
 2019-03-06 21:10:51 +01:00
Mario Vavti
08725c44c6 changelog 2019-03-06 21:08:56 +01:00
Mario Vavti
e18c64c9d9 bump version 2019-03-06 10:02:33 +01:00
Mario Vavti
7b018c60cb while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash) 
(cherry picked from commit 117a8cafca)
 2019-03-06 09:58:11 +01:00
M. Dent
a81286c795 Add CURLOPT_CONNECTTIMEOUT 
(cherry picked from commit 0c05e6593e)
 2019-03-06 09:56:01 +01:00
Mario
75a66b716e Merge branch 'patch-20190305a' into 'dev' 
Add CURLOPT_CONNECTTIMEOUT

See merge request hubzilla/core!1542
 2019-03-06 09:52:26 +01:00
M. Dent
0c05e6593e Add CURLOPT_CONNECTTIMEOUT 2019-03-06 09:52:26 +01:00
zotlabs
571e9bf26a channel_type is not integer 
(cherry picked from commit 26e7da0b96)
 2019-03-06 09:49:40 +01:00
zotlabs
c4714e95b6 maintain compatibility with recent zot6 changes 
(cherry picked from commit 98b1c7a38c)
 2019-03-06 09:49:18 +01:00
Mario
c43ab50d66 Merge branch 'dev' into 'dev' 
sync recent z6 protocol change

See merge request hubzilla/core!1541
 2019-03-06 09:47:40 +01:00
zotlabs
26e7da0b96 channel_type is not integer 2019-03-05 17:06:42 -08:00
zotlabs
98b1c7a38c maintain compatibility with recent zot6 changes 2019-03-05 16:57:32 -08:00
zotlabs
d407e5556e api_router - allow parameters as final path argument 
(cherry picked from commit 47001c3303)
 2019-03-05 09:44:36 +01:00
zotlabs
6a3cfe54af remove clones from delivery recipients for top-level posts - they will get the post via clone sync 
(cherry picked from commit 8e50fecccc)
 2019-03-05 09:43:51 +01:00
zotlabs
a0bffe4a78 mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode 
(cherry picked from commit 938fcdd1a6)
 2019-03-05 09:43:29 +01:00
zotlabs
336c716a44 translate name of content filter (addon) app. 
(cherry picked from commit 29cb62af3d)
 2019-03-05 09:42:58 +01:00
Mario
ccdbec619c Merge branch 'dev' into 'dev' 
assorted minor fixes from downstream

See merge request hubzilla/core!1540
 2019-03-05 09:40:45 +01:00
zotlabs
47001c3303 api_router - allow parameters as final path argument 2019-03-04 20:11:43 -08:00
zotlabs
8e50fecccc remove clones from delivery recipients for top-level posts - they will get the post via clone sync 2019-03-04 20:09:47 -08:00
zotlabs
938fcdd1a6 mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode 2019-03-04 20:07:01 -08:00
zotlabs
9ede57b228 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-04 14:50:33 -08:00
mike
8810658858 Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de' 
(cherry picked from commit e26de9c1d1)
 2019-03-04 09:50:47 +01:00
Mario
e074d02714 Merge branch 'dev' into 'dev' 
Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de'

See merge request hubzilla/core!1539
 2019-03-04 09:50:12 +01:00
mike
e26de9c1d1 Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de' 2019-03-03 18:24:36 +03:00
M. Dent
7dc3835a54 Merge branch 'core_fixes' into 'dev' 
while in legacy zot $sender is expected to be an array, in zot6 $sender is...

See merge request hubzilla/core!1538
 2019-03-03 03:37:33 +01:00
Mario Vavti
117a8cafca while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash) 2019-03-02 15:50:53 +01:00
mike
337dfd5ee4 Mention php-zip module dependency in administrator guide 
(cherry picked from commit 747ce9b1f1)
 2019-03-02 15:37:47 +01:00
DM42.Net (Matt Dent)
e37c9ed0a1 Use sender hash 
(cherry picked from commit 5febc3e07d)
 2019-03-02 15:37:22 +01:00
Mario Vavti
aa6a31eba5 iron out some kinks with scrollToItem() in combination with collapsed content and images 
(cherry picked from commit 2244bf2ba2)
 2019-03-02 15:32:36 +01:00
Mario
8a0a0aef5c Merge branch 'dev' into 'dev' 
Mention php-zip module dependency in administrator guide

See merge request hubzilla/core!1537
 2019-03-02 15:01:50 +01:00
Mario
4750e15c20 Merge branch 'patch-20190301a' into 'dev' 
Use sender hash

See merge request hubzilla/core!1535
 2019-03-02 15:00:20 +01:00
mike
747ce9b1f1 Mention php-zip module dependency in administrator guide 2019-03-02 12:21:59 +03:00
M. Dent
7fa874d9ef Merge branch 'js_fixes' into 'dev' 
iron out some kinks with scrollToItem() in combination with collapsed content and  images

See merge request hubzilla/core!1534
 2019-03-01 17:43:16 +01:00
DM42.Net (Matt Dent)
5febc3e07d Use sender hash 2019-03-01 10:50:10 -05:00
Mario Vavti
2244bf2ba2 iron out some kinks with scrollToItem() in combination with collapsed content and images 2019-03-01 14:16:19 +01:00
zotlabs
29cb62af3d translate name of content filter (addon) app. 2019-02-28 17:51:13 -08:00
Mario Vavti
6aa041b193 version 2019-02-26 09:30:54 +01:00
Mario Vavti
0fdc0a01d0 Merge branch 'dev' into 4.0RC 2019-02-26 09:29:00 +01:00
Mario Vavti
de7f2eef47 use $channel_id until the function is adapted to not need it 2019-02-26 09:28:16 +01:00
Mario
a449ffe49d Merge branch 'fix-sync_an_item' into 'dev' 
Fix sync an item

See merge request hubzilla/core!1531
 2019-02-26 09:26:00 +01:00
Mario Vavti
08cacc4943 Merge branch 'dev' into 4.0RC 2019-02-26 09:06:46 +01:00
Mario
04b9216758 Merge branch 'dev' into 'dev' 
zot api changes to support combined content (items+files) import addon

See merge request hubzilla/core!1533
 2019-02-25 14:06:37 +01:00
zotlabs
1ff97754af issues uncovered testing combined item/file import 2019-02-24 21:43:15 -08:00
zotlabs
20e43311db zot api changes to support combined content (items+files) import addon 2019-02-24 14:46:09 -08:00
M. Dent
89bcb1de42 Merge branch 'js_fixes' into 'dev' 
fix regression from commit 04ec35d9cc where...

See merge request hubzilla/core!1532
 2019-02-24 03:32:39 +01:00
DM42.Net (Matt Dent)
7a1a44f802 xchan_query and fetch_post_tags uses full query results not a single row 2019-02-23 21:03:05 -05:00
Mario Vavti
06aa32db22 fix regression from commit 04ec35d9cc where selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true 2019-02-23 21:48:45 +01:00
DM42.Net (Matt Dent)
6f8593cf47 Fixes - sync item based on item's user 2019-02-23 10:24:05 -05:00
DM42.Net (Matt Dent)
3b2efb1000 Fix misspelled variable 2019-02-23 10:09:58 -05:00
Klaus Weidenbach
87482e3746 Update PHP Version check during Setup. 
Hubzilla 4.0 requires PHP7. The oldest still supported PHP branch is 7.1.
So check during Setup for PHP >= 7.1.


(cherry picked from commit 3f13c85b64)
 2019-02-22 12:52:25 +01:00