harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,931 Commits 6 Branches 36 Tags 152 MiB
518ceb53a8
Commit Graph

23931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
zotlabs
94cbc8bd31 share fixes 2019-01-27 12:38:51 -08:00
Mario Vavti
e262de9b2d update nginx and lighttpd sample server configs to explicit dissalow access to util 2019-01-27 18:05:46 +01:00
Mario
17d9e30be5 Merge branch 'patch-20190125a' into 'dev' 
Remove extraneous sync logic

See merge request hubzilla/core!1490
 2019-01-27 17:36:56 +01:00
M. Dent
37b7dc8e7c Remove extraneous sync logic 2019-01-27 17:36:56 +01:00
Mario Vavti
5c2f7a744a Merge remote-tracking branch 'mike/master' into dev 2019-01-27 17:30:10 +01:00
zotlabs
535f0f45c9 cleanup of cli admin tool 2019-01-26 12:55:12 -08:00
zotlabs
b9cef2f38f command line tool for managing site admins 2019-01-26 12:17:52 -08:00
M. Dent
793d78fba6 Merge branch 'core_fixes' into 'dev' 
return false if http signatue is not valid

See merge request hubzilla/core!1489
 2019-01-26 00:21:09 +01:00
Max Kostikov
5ad055efb4 Merge branch 'dev' into 'dev' 
Update Russian translation

See merge request hubzilla/core!1491
 2019-01-25 20:04:19 +01:00
Max Kostikov
3277595366 Update hstrings.php 2019-01-25 19:56:15 +01:00
Max Kostikov
b11be32063 Update hmessages.po 2019-01-25 19:55:23 +01:00
Mario Vavti
725652006d bump version 2019-01-25 12:14:17 +01:00
Mario Vavti
10587e3a84 return false if http signatue is not valid 2019-01-25 10:49:17 +01:00
Mario
073115e7ab Merge branch 'apidocpublishing' into 'dev' 
Suggestion: Publish doxygen API documentation at gitlab pages.

See merge request hubzilla/core!1488
 2019-01-25 10:32:12 +01:00
Mario
45dcd987c5 Merge branch 'doku' into 'dev' 
Correct and extend Doxygen comments.

See merge request hubzilla/core!1485
 2019-01-25 10:31:09 +01:00
Mario Vavti
960246fbb9 Merge remote-tracking branch 'mike/master' into dev 2019-01-25 09:51:36 +01:00
zotlabs
2fa274de1e support photo items between zot and zot6 2019-01-24 19:08:57 -08:00
Klaus Weidenbach
4cc98874a0 Publish doxygen API documentation at gitlab pages. 
Create the API documentation with Doxygen and
publish it through gitlab-ci as a Gitlab page at:
https://hubzilla.frama.io/core
This should only happen when master gets updated.

Update Doxyfile configuration. Correct image usage.
Replace RedMatrix with Hubzilla icon.
 2019-01-24 22:03:15 +01:00
Max Kostikov
fafd05afb2 Merge branch 'js_fixes' into 'dev' 
possibly more  page jumping fixes

See merge request hubzilla/core!1486
 2019-01-24 21:57:42 +01:00
Max Kostikov
7a3ad30bfa Merge branch 'zot6_fixes' into 'dev' 
macke mod chanview aware of zot6

See merge request hubzilla/core!1487
 2019-01-24 21:57:14 +01:00
Mario Vavti
32acf9cb72 macke mod chanview aware of zot6 2019-01-24 18:06:27 +01:00
Mario Vavti
0946ac2ff9 possibly more page jumping fixes 2019-01-24 12:53:38 +01:00
Max Kostikov
1d314834a4 Merge branch 'js_fixes' into 'dev' 
fix page jumping when liking a collapsed/expanded post

See merge request hubzilla/core!1484
 2019-01-24 10:40:33 +01:00
Klaus Weidenbach
13e0151cd2 Correct and extend Doxygen comments. 
Correct some documentation errors for Doxygen and add
more comments.
Document some undefined variables with @FIXME.
 2019-01-23 22:25:47 +01:00
Mario
51a7be29f5 Merge branch 'prepare_text' into 'dev' 
Correct parameter in include/text.php prepare_text()

See merge request hubzilla/core!1483
 2019-01-23 15:41:54 +01:00