harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,389 Commits 6 Branches 36 Tags
develop
Commit Graph

25389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
M.Dent cbf6d53e84 Get all listeners 2019-02-11 20:24:17 -05:00
harukin 5f012c5dc9 Merge branch 'origin' into 'master' 
marge from origin 3.8.9

See merge request harukin/core!38
 2019-02-11 17:51:43 +09:00
harukin 5e0ce96e49 Merge branch 'origin' into 'japanese' 
marge from origin 3.8.9

See merge request harukin/core!37
 2019-02-11 17:51:12 +09:00
harukin 4a2228a372 Merge branch 'origin' into 'develop' 
marge from origin 3.8.9

See merge request harukin/core!36
 2019-02-11 17:48:25 +09:00
harukin d9a0382539 edit translation 2019-02-11 17:15:48 +09:00
Mario Vavti f52a532771 use ACTIVITY_SHARE to match the verb 2019-02-08 11:33:01 +01:00
Mario Vavti efc4c53b44 missing use App 2019-02-08 10:15:28 +01:00
zotlabs 4837f9cdad Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-02-07 19:54:07 -08:00
zotlabs 317c53acf6 disable repeat unless mid is a resolvable uri since this will do radically different things on different network stacks (e.g. Diaspora) and it turns out there is no possible way to make Diaspora reshares compatible with ActivityPub or Zot6 repeat/announce/boost/whatever. 2019-02-07 14:38:05 -08:00
zotlabs f02af5fe6e automatically redirect repeat to share for posts with unresolvable message-ids (diaspora, hz < 4.0, etc.). 2019-02-07 14:25:25 -08:00
zotlabs 92e6c21210 add missing zot6 conversation completion (required for message repeats) 2019-02-07 14:13:13 -08:00
zotlabs beb26e84f3 fix mid generation for shares 2019-02-07 11:18:34 -08:00
Mario Vavti 2b7a605223 exec updateInit() instead of notificationsUpdate() in jotShare() 2019-02-07 09:55:22 +01:00
Mario Vavti d70f0092f7 Merge remote-tracking branch 'mike/master' into dev 2019-02-07 09:34:22 +01:00
zotlabs 7f6e4a9744 fix verb for reshares 2019-02-06 19:59:05 -08:00
zotlabs 96a4fc7ca2 more work on share/repeat 2019-02-06 19:26:28 -08:00
zotlabs 29c1797493 work on repeat/share for Hubzilla 2019-02-06 17:26:09 -08:00
Mario Vavti 860dead985 Merge remote-tracking branch 'mike/master' into dev 2019-02-06 06:46:05 +01:00
zotlabs 518ceb53a8 allow conversation completion for new comments to expired posts, regardless of hyperdrive settings. 
Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored.
 2019-02-05 14:51:01 -08:00
Max Kostikov 4bcddca1f0 Merge branch 'viewsrc_update' into 'dev' 
add the actual mid for debuging reasons

See merge request hubzilla/core!1506
 2019-02-04 10:38:26 +01:00
Mario Vavti cf80f03084 Merge remote-tracking branch 'mike/master' into dev 2019-02-04 10:03:38 +01:00
zotlabs 47f31eed37 update tests for changes in handle_tags() 2019-02-03 17:10:33 -08:00
zotlabs 8ff9a9ff08 fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream. 2019-02-03 16:53:49 -08:00
Mario Vavti 8dcf27ba29 add the actual mid for debuging reasons 2019-02-03 21:12:09 +01:00
Mario Vavti d97043725d update changelog 2019-02-03 15:12:38 +01:00
Mario 90fd323ac5 bump version 2019-02-03 15:03:56 +01:00
Mario Vavti b6c384a0f7 cleanup logging and return if query returns empty result 
(cherry picked from commit c657d766cf)
 2019-02-03 15:02:06 +01:00
Mario Vavti cda8a7be38 do not overwrite $sql_extra 
(cherry picked from commit 4706ff6938)
 2019-02-03 15:01:39 +01:00
Mario Vavti c657d766cf cleanup logging and return if query returns empty result 2019-02-03 14:58:19 +01:00
Mario Vavti 4706ff6938 do not overwrite $sql_extra 2019-02-03 14:52:50 +01:00
M. Dent c444af007f Merge branch 'core_fixes' into 'dev' 
fix #1332

See merge request hubzilla/core!1505
 2019-02-03 02:22:16 +01:00
Mario Vavti 6e80bb49fb fix #1332 2019-02-02 22:11:26 +01:00
Mario bf3d0c1274 Merge branch 'patch-20190201a' into 'dev' 
Add filter hooks and the ability to add buttons to the default status editor

See merge request hubzilla/core!1502
 2019-02-02 20:50:40 +01:00
M. Dent 0ded1d326c Merge branch 'dev' into 'dev' 
Prevent Hubzilla usage for SEO backlinks

See merge request hubzilla/core!1501
 2019-02-01 18:01:01 +01:00
DM42.Net (Matt Dent) 708d288121 Add filter hooks and the ability to add buttons to the default status editor 2019-02-01 09:49:11 -05:00
Max Kostikov 6462c83f69 Prevent Hubzilla usage for SEO backlinks 2019-02-01 15:47:51 +01:00
Mario f30bb452cc Merge branch 'patch-20190130a' into 'dev' 
Set lock red and provide warning  if a forum is tagged in the post

See merge request hubzilla/core!1499
 2019-02-01 09:29:59 +01:00
M. Dent ad4dd2def5 Set lock red and provide warning if a forum is tagged in the post 2019-02-01 09:29:59 +01:00
Max Kostikov 76582a60b5 Merge branch 'core_fixes' into 'dev' 
starring and filing is only supported for post item type

See merge request hubzilla/core!1498
 2019-01-31 18:39:07 +01:00
Mario 004246163d starring and filing is only supported for post item type 2019-01-31 18:39:07 +01:00
Max Kostikov a2cae45f00 Merge branch 'dev' into 'dev' 
Fix typos in Russian translation

See merge request hubzilla/core!1500
 2019-01-31 18:14:16 +01:00
Max Kostikov c1159337da Update hstrings.php 2019-01-31 18:06:19 +01:00
Max Kostikov 71adbd7c39 Update hmessages.po 2019-01-31 18:06:09 +01:00
harukin ded949052c edit translation 2019-01-31 18:44:51 +09:00
harukin 40fd6eb358 Merge branch 'develop' into 'master' 
日本語の実装(暫定的)

See merge request harukin/core!35
 2019-01-31 16:59:44 +09:00
harukin 48b65bf9d8 Merge branch 'develop' into 'master' 
日本語の実装(暫定的)

See merge request harukin/core!34
 2019-01-31 16:57:50 +09:00
harukin a761f9eb55 日本語の実装(暫定的) 2019-01-31 16:57:50 +09:00
harukin d1bf0da144 Merge branch 'japanese' into 'develop' 
日本語の実装(暫定的)

See merge request harukin/core!33
 2019-01-31 16:55:50 +09:00
harukin de15a1e7c8 edit translation 2019-01-31 16:50:53 +09:00
zotlabs a56bc0e1e0 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-30 18:34:44 -08:00