harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,337 Commits 6 Branches 36 Tags
23fc7e65d400d3c4f68bb8e54f754ca5f5887ea1
Commit Graph
24337 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
harukin 23fc7e65d4 Merge branch 'origin' into 'master' 
marge from origin 4.0

See merge request harukin/core!42
 2019-03-09 17:59:08 +09:00
Mario Vavti 9772726065 merge text.php and hmessages.po 2019-03-08 12:32:20 +01:00
Mario Vavti 8ecdde6cb5 Merge branch '4.0RC' 2019-03-08 11:52:57 +01:00
Mario Vavti 5b3824917d update changelog 2019-03-08 11:48:01 +01:00
Mario Vavti ca4f10dc5e bump version 2019-03-08 11:46:36 +01:00
Mario 853fb33913 $sender is supposed to be string in libzot 
(cherry picked from commit 507c71f64c)
 2019-03-08 09:45:15 +01:00
zotlabsandMario e352cfc861 fetch private objects using delivery channel credentials 
(cherry picked from commit 1f7622e4c4)
 2019-03-08 09:35:04 +01:00
Mario Vavti b019ca0746 update changelog 
(cherry picked from commit 04fe7e61de)
 2019-03-07 09:32:39 +01:00
zotlabsandMario beb4e00afb guest access tokens: xchan record not created on URL login 
(cherry picked from commit 0b2213dd41)
 2019-03-07 09:30:38 +01:00
Mario Vavti 9450305568 changelog 
(cherry picked from commit 08725c44c6)
 2019-03-06 21:10:51 +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. DentandMario a81286c795 Add CURLOPT_CONNECTTIMEOUT 
(cherry picked from commit 0c05e6593e)
 2019-03-06 09:56:01 +01:00
zotlabsandMario 571e9bf26a channel_type is not integer 
(cherry picked from commit 26e7da0b96)
 2019-03-06 09:49:40 +01:00
zotlabsandMario c4714e95b6 maintain compatibility with recent zot6 changes 
(cherry picked from commit 98b1c7a38c)
 2019-03-06 09:49:18 +01:00
zotlabsandMario d407e5556e api_router - allow parameters as final path argument 
(cherry picked from commit 47001c3303)
 2019-03-05 09:44:36 +01:00
zotlabsandMario 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
zotlabsandMario 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
zotlabsandMario 336c716a44 translate name of content filter (addon) app. 
(cherry picked from commit 29cb62af3d)
 2019-03-05 09:42:58 +01:00
mikeandMario 8810658858 Addressing new '[email protected]' support forum instead of old '[email protected]' 
(cherry picked from commit e26de9c1d1)
 2019-03-04 09:50:47 +01:00
mikeandMario 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)andMario 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
harukin 027847a663 Merge branch 'develop' into 'master' 
cmd+enterキー有効化

See merge request harukin/core!39
 2019-02-27 11:19:32 +09:00
harukin 8134ba1faf add cmd support test 2019-02-27 10:53:11 +09: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 WeidenbachandMario 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
Mario ef6a280019 Merge branch 'php' into 'dev' 
Update PHP Version check during Setup.

See merge request hubzilla/core!1530
 2019-02-22 12:51:48 +01:00
Max Kostikov 326ae05b06 Merge branch 'es-es' into 'dev' 
Quickfix es-es/hstrings.php

See merge request hubzilla/core!1529
 2019-02-22 11:32:33 +01:00
Klaus Weidenbach 3f13c85b64 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.
 2019-02-21 21:31:36 +01:00
Manuel Jiménez Friaza 1ae7bd6477 Merge branch 'cherry-pick-f92d2e3f' into 'es-es' 
Quickfix es-es/hstrings.php

See merge request mjfriaza/core!6
 2019-02-21 18:55:39 +01:00
Manuel Jiménez FriazaandManuel Jiménez Friaza c91641aa83 Quickfix es-es/hstrings.php 
(cherry picked from commit f92d2e3f7c)
 2019-02-21 18:37:21 +01:00
Manuel Jiménez Friaza 3e2489465f Merge branch 'cherry-pick-a9b75d05' into 'es-es' 
Fix es-es/hstrings.php

See merge request mjfriaza/core!5
 2019-02-21 12:59:29 +01:00
Manuel Jiménez FriazaandManuel Jiménez Friaza a5bf32a97d Fix es-es/hstrings.php 
(cherry picked from commit a9b75d059b)
 2019-02-21 12:46:48 +01:00
Manuel Jiménez FriazaandMario 8bb2d29a8d Update Spanish translation 
(cherry picked from commit e6f289deb6)

(cherry picked from commit a3a90ea09b)
 2019-02-21 12:43:03 +01:00
Mario 938e8110ca Merge branch 'es-es' into 'dev' 
Update es-es

See merge request hubzilla/core!1526
 2019-02-21 12:34:31 +01:00
Mario Vavti 93039081d5 fix summary and use item_normal_search() for viewsrc so we can also view the source for articles, cards, etc. 
(cherry picked from commit a0ad110cff)
 2019-02-21 12:10:31 +01:00
M. Dent 3d253309b7 Merge branch 'core_fixes' into 'dev' 
fix summary and use item_normal_search() for viewsrc so we can also view the...

See merge request hubzilla/core!1525
 2019-02-21 12:03:56 +01:00