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

24049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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 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 Friaza
a5bf32a97d Fix es-es/hstrings.php 
(cherry picked from commit a9b75d059b)
 2019-02-21 12:46:48 +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
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
Manuel Jiménez Friaza
301c1861f3 Merge branch 'cherry-pick-e6f289de' into 'es-es' 
Update Spanish translation

See merge request mjfriaza/core!4
 2019-02-21 11:54:41 +01:00
Manuel Jiménez Friaza
a3a90ea09b Update Spanish translation 
(cherry picked from commit e6f289deb6)
 2019-02-21 11:38:45 +01:00
Mario Vavti
a0ad110cff fix summary and use item_normal_search() for viewsrc so we can also view the source for articles, cards, etc. 2019-02-21 08:48:47 +01:00
Mario Vavti
7f1e0313a0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-02-20 09:12:24 +01:00
Mario Vavti
c89be96209 bump dev version 2019-02-20 09:12:04 +01:00
Max Kostikov
fcd6c3065e Merge branch 'dev' into 'dev' 
Update Russian translation

See merge request hubzilla/core!1524
 2019-02-20 09:06:12 +01:00
Mario Vavti
a700ef5e24 bump version 2019-02-20 09:04:48 +01:00
Max Kostikov
3a6ea57d2c Update Russian hstrings.php 2019-02-20 09:00:05 +01:00
Max Kostikov
e960bcfd1c Update Russian hmessages.po 2019-02-20 08:59:50 +01:00
Mario
65e8ed6871 Merge branch 'dev' into 'dev' 
basic support for nomadic content, fix for permitted guests deleting their own files in cloud space of other channel,urlencode category widget links

See merge request hubzilla/core!1523
 2019-02-20 08:52:13 +01:00
zotlabs
a77d7b8442 urlencode links in category widget 2019-02-19 20:51:06 -08:00
zotlabs
51e9f302b0 hubzilla has uuid - use that instead of wildcard 2019-02-19 13:36:53 -08:00
zotlabs
72fd1cc5a6 remove extraneous logging 2019-02-19 13:23:46 -08:00
zotlabs
1a77bdd1d0 fix ability for file storage creators (visitors) to be able to delete their own content 2019-02-19 13:14:19 -08:00
zotlabs
1ea9002fe8 Merge branch 'dev' of https://framagit.org/zot/core into dev 2019-02-19 11:56:26 -08:00
zotlabs
7d1c3920fd mod_id should return object not collection 2019-02-19 11:45:42 -08:00
Mario Vavti
cead10b9af update composer autoload cache 2019-02-19 10:24:20 +01:00
Mario Vavti
382e94e282 update strings 2019-02-19 10:21:53 +01:00