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

23914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Mario
ef46738384 Merge branch 'dev' into 'dev' 
Skip tags detection in URL

See merge request hubzilla/core!1482
 2019-01-23 15:39:13 +01:00
Mario Vavti
54806f6ee8 fix page jumping when liking a collapsed/expanded post 2019-01-23 15:36:34 +01:00
Klaus Weidenbach
ae538a2259 Correct parameter in include/text.php prepare_text() 
Also extend documentation.
 2019-01-22 23:25:30 +01:00
Max Kostikov
66f443fd00 Skip tags detection in URL 2019-01-22 16:23:44 +01:00
Mario
ca9c29e2b6 Merge branch 'embedphotos' into 'dev' 
Try to fix some warnings in Zotlabs\Module\Embedphotos.

See merge request hubzilla/core!1481
 2019-01-22 12:23:20 +01:00
Mario
273beb016b Merge branch 'patch-20190114a' into 'dev' 
Add remaining hook insertions

See merge request hubzilla/core!1471
 2019-01-22 12:13:16 +01:00
M. Dent
cd8a0f33b5 Add remaining hook insertions 2019-01-22 12:13:16 +01:00
Klaus Weidenbach
b1e05b4832 Try to fix some warnings in Zotlabs\Module\Embedphotos. 
$phototypes was undefined, hope this is correct selection
to fix it.
Correct Doxygen and clean up some variables and refactoring.
 2019-01-22 00:59:00 +01:00
Mario Vavti
4c0378eeae Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-01-21 12:04:57 +01:00
Mario Vavti
ea14398929 Merge remote-tracking branch 'mike/master' into dev 2019-01-21 12:04:01 +01:00
zotlabs
1b5dd8bbd7 comment permission fix 2019-01-20 15:09:35 -08:00
M. Dent
39128c34cc Merge branch 'dev' into 'dev' 
Some fixes in include/help.php.

See merge request hubzilla/core!1479
 2019-01-19 05:21:53 +01:00
M. Dent
542d21c4e1 Merge branch 'bugfix-plugin' into 'dev' 
Fix wrong variable name in include/plugin.php.

See merge request hubzilla/core!1480
 2019-01-19 05:18:35 +01:00
Klaus Weidenbach
90a62405ca Fix wrong variable name in include/plugin.php. 2019-01-19 00:28:01 +01:00
Klaus Weidenbach
bba20c27fe Some fixes in include/help.php. 
Remove unused variables and a wrong function name.
 2019-01-18 22:37:05 +01:00
Mario Vavti
d355e57fa6 Merge remote-tracking branch 'mike/master' into dev 2019-01-18 10:09:16 +01:00
Mario
f2d7c4091a Merge branch 'QA' into 'dev' 
Add PostgreSQL to gitlab-ci setup.

See merge request hubzilla/core!1478
 2019-01-18 10:05:13 +01:00