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

24106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
zotlabs
a56bc0e1e0 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-30 18:34:44 -08:00
zotlabs
519db2aace set document title when title changes on a page update 2019-01-30 18:33:10 -08:00
Mario Vavti
e64c5661da Merge remote-tracking branch 'mike/master' into dev 2019-01-30 09:48:07 +01:00
zotlabs
b15421826d cache embeds in the background on initial storage rather than on first access 2019-01-29 15:14:49 -08:00
Mario Vavti
3b31dbaa16 clean up whitespace and remove superfluous semicolon 2019-01-29 22:37:30 +01:00
Mario
318957cb81 Merge branch 'dev' into 'dev' 
Custom sessionhandler support, as requested

See merge request hubzilla/core!1497
 2019-01-29 22:22:59 +01:00
Mark Nowiasz
4b516fdb09 Custom sessionhandler support, as requested 2019-01-29 21:41:23 +01:00
Mario
913b620c66 Revert "Make session handler pluggable" 
This reverts commit 8972ca8134
 2019-01-29 21:16:38 +01:00
Mario
cd4d90c647 Revert "fix wrong function name and coding style" 
This reverts commit 456207b4e7
 2019-01-29 21:16:16 +01:00
Mario Vavti
456207b4e7 fix wrong function name and coding style 2019-01-29 10:13:49 +01:00
Mario
39604d2fdc Merge branch 'sessionhandlerhook' into 'dev' 
Make session handler pluggable

See merge request hubzilla/core!1494
 2019-01-29 10:06:37 +01:00
Mario
27e415e664 Merge branch 'boot' into 'dev' 
Correct variable in boot.php

See merge request hubzilla/core!1495
 2019-01-29 10:06:18 +01:00
Mario
c57a4cf926 Merge branch 'doku' into 'dev' 
Extend documentation.

See merge request hubzilla/core!1496
 2019-01-29 10:06:04 +01:00
Mario Vavti
0a868b5c27 Merge remote-tracking branch 'mike/master' into dev 2019-01-29 09:49:53 +01:00
zotlabs
753f137575 disable hyperdrive in hubzilla 2019-01-28 15:29:39 -08:00
Klaus Weidenbach
728788e3b9 Extend documentation. 2019-01-28 23:58:19 +01:00
Klaus Weidenbach
ec6e130eb3 Correct variable in boot.php 2019-01-28 23:10:36 +01:00
DM42.Net (Matt Dent)
8972ca8134 Make session handler pluggable 2019-01-28 14:20:46 -05:00
Mario Vavti
671b6d2eda Merge remote-tracking branch 'mike/master' into dev 2019-01-28 12:48:21 +01:00
zotlabs
043f7bf2ab Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-28 02:48:57 -08:00
zotlabs
625cdde9a4 block private reshares from zot6 due to different parents 2019-01-28 02:46:45 -08:00
M. Dent
e3d39fbf3f Merge branch 'core_fixes' into 'dev' 
update nginx and lighttpd sample server configs to explicit dissalow access to util

See merge request hubzilla/core!1493
 2019-01-28 05:41:26 +01:00