Commit Graph

  • f30bb452cc Merge branch 'patch-20190130a' into 'dev' Mario 2019-02-01 09:29:59 +01:00
  • ad4dd2def5 Set lock red and provide warning if a forum is tagged in the post M. Dent 2019-02-01 09:29:59 +01:00
  • 76582a60b5 Merge branch 'core_fixes' into 'dev' Max Kostikov 2019-01-31 18:39:07 +01:00
  • 004246163d starring and filing is only supported for post item type Mario 2019-01-31 18:39:07 +01:00
  • a2cae45f00 Merge branch 'dev' into 'dev' Max Kostikov 2019-01-31 18:14:16 +01:00
  • c1159337da Update hstrings.php Max Kostikov 2019-01-31 18:06:19 +01:00
  • 71adbd7c39 Update hmessages.po Max Kostikov 2019-01-31 18:06:09 +01:00
  • ded949052c edit translation harukin 2019-01-31 18:44:51 +09:00
  • 40fd6eb358 Merge branch 'develop' into 'master' harukin 2019-01-31 16:59:44 +09:00
  • 48b65bf9d8 Merge branch 'develop' into 'master' harukin 2019-01-31 16:57:50 +09:00
  • a761f9eb55 日本語の実装(暫定的) harukin 2019-01-31 16:57:50 +09:00
  • d1bf0da144 Merge branch 'japanese' into 'develop' harukin 2019-01-31 16:55:50 +09:00
  • de15a1e7c8 edit translation harukin 2019-01-31 16:50:53 +09:00
  • a56bc0e1e0 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2019-01-30 18:34:44 -08:00
  • 519db2aace set document title when title changes on a page update zotlabs 2019-01-30 18:33:10 -08:00
  • e64c5661da Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-30 09:48:07 +01:00
  • b15421826d cache embeds in the background on initial storage rather than on first access zotlabs 2019-01-29 15:14:49 -08:00
  • 3b31dbaa16 clean up whitespace and remove superfluous semicolon Mario Vavti 2019-01-29 22:37:30 +01:00
  • 318957cb81 Merge branch 'dev' into 'dev' Mario 2019-01-29 22:22:59 +01:00
  • 4b516fdb09 Custom sessionhandler support, as requested Mark Nowiasz 2019-01-29 21:41:23 +01:00
  • 913b620c66 Revert "Make session handler pluggable" Mario 2019-01-29 21:16:38 +01:00
  • cd4d90c647 Revert "fix wrong function name and coding style" Mario 2019-01-29 21:16:16 +01:00
  • 456207b4e7 fix wrong function name and coding style Mario Vavti 2019-01-29 10:13:49 +01:00
  • 39604d2fdc Merge branch 'sessionhandlerhook' into 'dev' Mario 2019-01-29 10:06:37 +01:00
  • 27e415e664 Merge branch 'boot' into 'dev' Mario 2019-01-29 10:06:18 +01:00
  • c57a4cf926 Merge branch 'doku' into 'dev' Mario 2019-01-29 10:06:04 +01:00
  • 0a868b5c27 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-29 09:49:53 +01:00
  • 753f137575 disable hyperdrive in hubzilla zotlabs 2019-01-28 15:29:39 -08:00
  • 728788e3b9 Extend documentation. Klaus Weidenbach 2019-01-26 00:47:39 +01:00
  • ec6e130eb3 Correct variable in boot.php Klaus Weidenbach 2019-01-28 23:10:36 +01:00
  • 8972ca8134 Make session handler pluggable DM42.Net (Matt Dent) 2019-01-28 14:20:46 -05:00
  • 671b6d2eda Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-28 12:48:21 +01:00
  • 043f7bf2ab Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2019-01-28 02:48:57 -08:00
  • 625cdde9a4 block private reshares from zot6 due to different parents zotlabs 2019-01-28 02:46:45 -08:00
  • e3d39fbf3f Merge branch 'core_fixes' into 'dev' M. Dent 2019-01-28 05:41:26 +01:00
  • 94cbc8bd31 share fixes zotlabs 2019-01-27 12:38:51 -08:00
  • e262de9b2d update nginx and lighttpd sample server configs to explicit dissalow access to util Mario Vavti 2019-01-27 18:05:46 +01:00
  • 17d9e30be5 Merge branch 'patch-20190125a' into 'dev' Mario 2019-01-27 17:36:56 +01:00
  • 37b7dc8e7c Remove extraneous sync logic M. Dent 2019-01-27 17:36:56 +01:00
  • 5c2f7a744a Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-27 17:30:10 +01:00
  • 535f0f45c9 cleanup of cli admin tool zotlabs 2019-01-26 12:55:12 -08:00
  • b9cef2f38f command line tool for managing site admins zotlabs 2019-01-26 12:17:52 -08:00
  • 793d78fba6 Merge branch 'core_fixes' into 'dev' M. Dent 2019-01-26 00:21:09 +01:00
  • 5ad055efb4 Merge branch 'dev' into 'dev' Max Kostikov 2019-01-25 20:04:19 +01:00
  • 3277595366 Update hstrings.php Max Kostikov 2019-01-25 19:56:15 +01:00
  • b11be32063 Update hmessages.po Max Kostikov 2019-01-25 19:55:23 +01:00
  • 725652006d bump version Mario Vavti 2019-01-25 12:14:17 +01:00
  • 10587e3a84 return false if http signatue is not valid Mario Vavti 2019-01-25 10:49:17 +01:00
  • 073115e7ab Merge branch 'apidocpublishing' into 'dev' Mario 2019-01-25 10:32:12 +01:00
  • 45dcd987c5 Merge branch 'doku' into 'dev' Mario 2019-01-25 10:31:09 +01:00
  • 960246fbb9 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-25 09:51:36 +01:00
  • 2fa274de1e support photo items between zot and zot6 zotlabs 2019-01-24 19:08:57 -08:00
  • 4cc98874a0 Publish doxygen API documentation at gitlab pages. Klaus Weidenbach 2019-01-12 18:33:18 +01:00
  • fafd05afb2 Merge branch 'js_fixes' into 'dev' Max Kostikov 2019-01-24 21:57:42 +01:00
  • 7a3ad30bfa Merge branch 'zot6_fixes' into 'dev' Max Kostikov 2019-01-24 21:57:14 +01:00
  • 32acf9cb72 macke mod chanview aware of zot6 Mario Vavti 2019-01-24 18:06:27 +01:00
  • ddbc35181c fix page jumping when liking a collapsed/expanded post Mario Vavti 2019-01-23 14:36:34 +00:00
  • 0946ac2ff9 possibly more page jumping fixes Mario Vavti 2019-01-24 12:53:38 +01:00
  • 1d314834a4 Merge branch 'js_fixes' into 'dev' Max Kostikov 2019-01-24 10:40:33 +01:00
  • 875aecf9c6 edit translation harukin 2019-01-24 17:43:03 +09:00
  • 13e0151cd2 Correct and extend Doxygen comments. Klaus Weidenbach 2019-01-18 22:17:10 +01:00
  • 51a7be29f5 Merge branch 'prepare_text' into 'dev' Mario 2019-01-23 15:41:54 +01:00
  • ef46738384 Merge branch 'dev' into 'dev' Mario 2019-01-23 15:39:13 +01:00
  • 54806f6ee8 fix page jumping when liking a collapsed/expanded post Mario Vavti 2019-01-23 15:36:34 +01:00
  • ae538a2259 Correct parameter in include/text.php prepare_text() Klaus Weidenbach 2019-01-22 23:25:30 +01:00
  • 66f443fd00 Skip tags detection in URL Max Kostikov 2019-01-22 16:23:44 +01:00
  • ca9c29e2b6 Merge branch 'embedphotos' into 'dev' Mario 2019-01-22 12:23:20 +01:00
  • 273beb016b Merge branch 'patch-20190114a' into 'dev' Mario 2019-01-22 12:13:16 +01:00
  • cd8a0f33b5 Add remaining hook insertions M. Dent 2019-01-22 12:13:16 +01:00
  • b1e05b4832 Try to fix some warnings in Zotlabs\Module\Embedphotos. Klaus Weidenbach 2019-01-19 23:13:16 +01:00
  • 4c0378eeae Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2019-01-21 12:04:57 +01:00
  • ea14398929 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-21 12:04:01 +01:00
  • 1b5dd8bbd7 comment permission fix zotlabs 2019-01-20 15:09:35 -08:00
  • c85acf8044 edit translation harukin 2019-01-20 22:33:47 +09:00
  • 78a587791f edit translation harukin 2019-01-20 21:38:53 +09:00
  • f4a3ebcb41 edit translation harukin 2019-01-20 21:31:43 +09:00
  • 4e8fc6d198 Merge remote-tracking branch 'upstream/dev' into dev Manuel Jiménez Friaza 2019-01-20 12:58:27 +01:00
  • 086dab902c edit translation harukin 2019-01-20 17:22:38 +09:00
  • 722c03b6c6 edit translation harukin 2019-01-20 17:08:14 +09:00
  • 39128c34cc Merge branch 'dev' into 'dev' M. Dent 2019-01-19 05:21:53 +01:00
  • 542d21c4e1 Merge branch 'bugfix-plugin' into 'dev' M. Dent 2019-01-19 05:18:35 +01:00
  • 90a62405ca Fix wrong variable name in include/plugin.php. Klaus Weidenbach 2019-01-19 00:28:01 +01:00
  • bba20c27fe Some fixes in include/help.php. Klaus Weidenbach 2019-01-18 22:37:05 +01:00
  • d355e57fa6 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-18 10:09:16 +01:00
  • f2d7c4091a Merge branch 'QA' into 'dev' Mario 2019-01-18 10:05:13 +01:00
  • bf879ce742 Merge branch 'dreport_fixes' into 'dev' M. Dent 2019-01-18 06:15:01 +01:00
  • e89a3b05ec Merge branch 'core_fixes' into 'dev' M. Dent 2019-01-18 06:13:04 +01:00
  • 52305ca91b more specific network checking in several places and remove some old debugging crud zotlabs 2019-01-17 14:45:53 -08:00
  • d6167636fa Add PostgreSQL to gitlab-ci setup. Klaus Weidenbach 2019-01-15 01:01:49 +01:00
  • cc1e1a525f possible fix for #1326 Mario Vavti 2019-01-17 21:42:24 +01:00
  • 96deae43fa this should fix the rest of the event stuff zotlabs 2019-01-17 11:47:55 -08:00
  • 5aa0267936 add space Mario Vavti 2019-01-17 20:09:19 +01:00
  • b1b1e0eba4 channel connect issue zotlabs 2019-01-17 10:47:04 -08:00
  • 07f6465872 fix delivery report for zot6 connections Mario Vavti 2019-01-17 11:39:52 +01:00
  • eda7c5369c event attendance testing continued (now works at a basic level from one direction, more testing needed) zotlabs 2019-01-16 21:09:04 -08:00
  • e9f709301c more z6 event work zotlabs 2019-01-16 17:32:16 -08:00
  • 7e29bd10b6 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2019-01-16 16:52:21 -08:00
  • 20eea2184b more work on z6 events zotlabs 2019-01-16 16:50:44 -08:00
  • eaa375936f more z6 compatibility fixes zotlabs 2019-01-16 15:28:30 -08:00
  • de8582ec07 Merge branch 'fix_dreport_issue' into dev Mario Vavti 2019-01-16 21:52:16 +01:00