Commit Graph

  • 3d253309b7 Merge branch 'core_fixes' into 'dev' M. Dent 2019-02-21 12:03:56 +01:00
  • 301c1861f3 Merge branch 'cherry-pick-e6f289de' into 'es-es' Manuel Jiménez Friaza 2019-02-21 11:54:41 +01:00
  • a3a90ea09b Update Spanish translation Manuel Jiménez Friaza 2019-02-21 10:30:17 +00:00
  • e6f289deb6 Update Spanish translation Manuel Jiménez Friaza 2019-02-21 11:30:17 +01:00
  • 0e22618d93 Merge remote-tracking branch 'upstream/dev' into dev Manuel Jiménez Friaza 2019-02-21 11:18:59 +01:00
  • a0ad110cff fix summary and use item_normal_search() for viewsrc so we can also view the source for articles, cards, etc. Mario Vavti 2019-02-21 08:48:47 +01:00
  • 89ee28f858 Update Russian hstrings.php Max Kostikov 2019-02-20 08:00:05 +00:00
  • 5917786296 Update Russian hmessages.po Max Kostikov 2019-02-20 07:59:50 +00:00
  • 7f1e0313a0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2019-02-20 09:12:24 +01:00
  • c89be96209 bump dev version Mario Vavti 2019-02-20 09:12:04 +01:00
  • fcd6c3065e Merge branch 'dev' into 'dev' Max Kostikov 2019-02-20 09:06:12 +01:00
  • a700ef5e24 bump version Mario Vavti 2019-02-20 09:04:48 +01:00
  • 3a6ea57d2c Update Russian hstrings.php Max Kostikov 2019-02-20 09:00:05 +01:00
  • e960bcfd1c Update Russian hmessages.po Max Kostikov 2019-02-20 08:59:50 +01:00
  • 65e8ed6871 Merge branch 'dev' into 'dev' Mario 2019-02-20 08:52:13 +01:00
  • a77d7b8442 urlencode links in category widget zotlabs 2019-02-19 20:51:06 -08:00
  • 51e9f302b0 hubzilla has uuid - use that instead of wildcard zotlabs 2019-02-19 13:36:53 -08:00
  • 72fd1cc5a6 remove extraneous logging zotlabs 2019-02-19 13:23:46 -08:00
  • 1a77bdd1d0 fix ability for file storage creators (visitors) to be able to delete their own content zotlabs 2019-02-19 13:14:19 -08:00
  • 1ea9002fe8 Merge branch 'dev' of https://framagit.org/zot/core into dev zotlabs 2019-02-19 11:56:26 -08:00
  • 7d1c3920fd mod_id should return object not collection zotlabs 2019-02-19 11:45:42 -08:00
  • c5bb074573 Merge remote-tracking branch 'upstream/dev' into dev Manuel Jiménez Friaza 2019-02-19 12:15:59 +01:00
  • cead10b9af update composer autoload cache Mario Vavti 2019-02-19 10:24:20 +01:00
  • 382e94e282 update strings Mario Vavti 2019-02-19 10:21:53 +01:00
  • 7e8434404f Merge branch 'patch-20190218a' into 'dev' Mario 2019-02-19 08:46:03 +01:00
  • cfcbaf33af Fix: post_activity_item returns success => true even on failure. M.Dent 2019-02-18 22:40:19 -05:00
  • 175f78fa84 support zot location independent urls zotlabs 2019-02-18 18:16:50 -08:00
  • c8ab2bec5e Merge branch 'js_fixes' into 'dev' M. Dent 2019-02-19 01:24:35 +01:00
  • 136d50a7c5 Merge branch 'mod_display_fixes' into 'dev' M. Dent 2019-02-19 01:23:28 +01:00
  • 0fa653d580 Merge branch 'core_fixes' into 'dev' M. Dent 2019-02-19 01:21:37 +01:00
  • 48f2c85791 prevent page jumping on like if comments are expanded (show all x comments) Mario Vavti 2019-02-18 14:40:41 +01:00
  • 13ca56d380 if local_channel() and updating the page do not query for another item if the first query returned no results. we will most probably find an item from another channel (e.g. after liking a comment) and end up with multiple items with the same mid from different channels after the page update Mario Vavti 2019-02-18 14:27:01 +01:00
  • b5109d2a1a Merge branch 'photo_driver_refactor' into 'dev' Mario 2019-02-18 10:02:46 +01:00
  • 8ab532efb5 remove zottel.net from fallback servers. it switched to directory_mode_normal from secondary Mario Vavti 2019-02-18 10:02:18 +01:00
  • f11c17063c Merge branch 'QA' into 'dev' Mario 2019-02-18 09:44:26 +01:00
  • 72eb44aebc Merge branch 'dev' into 'dev' Mario 2019-02-18 09:41:38 +01:00
  • b070503e77 MySQL 8 admin summary compatibility Max Kostikov 2019-02-17 22:47:08 +01:00
  • f48e1ee0ac Improve gitlab-ci environment. Klaus Weidenbach 2019-02-15 01:12:14 +01:00
  • a5b7590d3a Merge branch 'exclude_addon_common' into 'dev' M. Dent 2019-02-15 22:03:33 +01:00
  • f0955f1620 Merge branch 'rm_addon_settings' into 'dev' M. Dent 2019-02-15 22:02:33 +01:00
  • 6dda2713cf edit translation harukin 2019-02-15 23:29:31 +09:00
  • 4769254978 deprecate addon settings Mario 2019-02-15 12:35:19 +01:00
  • ca917f7b9a exclude addon_common from addon list Mario 2019-02-15 11:39:59 +01:00
  • b9df4c99cf Remove duplicate code in PhotoDriver classes. Klaus Weidenbach 2019-02-11 23:59:43 +01:00
  • e6dadb215e Refactor photo_driver to use namespaces. Klaus Weidenbach 2019-02-05 23:03:03 +01:00
  • d70bba2806 Clean up and documentation in photo_drive. Klaus Weidenbach 2019-02-01 00:21:01 +01:00
  • 3217452b02 missing use app Mario Vavti 2019-02-14 14:48:16 +01:00
  • ff0494b180 Merge branch 'affinity_fixes' into 'dev' M. Dent 2019-02-14 14:06:25 +01:00
  • 8be15c1b5b Merge branch 'disable_repeats' into 'dev' M. Dent 2019-02-14 14:05:24 +01:00
  • 0207b5ba8b disable repeats until issues are resolved Mario Vavti 2019-02-14 11:32:43 +01:00
  • 5ab917f606 affinity tool fixes Mario Vavti 2019-02-14 11:06:52 +01:00
  • ea541ca21b Merge branch 'aff2' into 'dev' Mario 2019-02-14 09:56:53 +01:00
  • fc223f5924 affinity slider as app phani00 2019-02-14 09:56:53 +01:00
  • 7b8eb84cb8 Merge branch 'patch-20190212a' into 'dev' Mario 2019-02-13 20:36:33 +01:00
  • 38443c72c3 おまえかぁぁぁぁぁぁぁぁぁあ!!!!!!!!!!!!!!!!!!!!!11 harukin 2019-02-13 23:56:49 +09:00
  • 0cef3e67ce fix delete strings.php.... harukin 2019-02-13 23:49:33 +09:00
  • b98d4875da fix strings.php harukin 2019-02-13 23:24:13 +09:00
  • ae52db41de edit translation harukin 2019-02-13 23:19:40 +09:00
  • c3e2b463e4 Only cascade privacy warning if thread parent has privacy concerns. M.Dent 2019-02-13 08:26:03 -05:00
  • 5b3ea012ab Fix: only first lock red with privacy_warning M.Dent 2019-02-12 22:05:57 -05:00
  • 07df43aa2a Merge branch 'dev' into 'dev' Max Kostikov 2019-02-12 11:55:17 +01:00
  • 6e3bc77369 Update hstrings.php Max Kostikov 2019-02-12 11:48:50 +01:00
  • 24ddefe3ad Update hmessages.po Max Kostikov 2019-02-12 11:47:53 +01:00
  • 7db645587b Merge branch 'fix-20190211a' into 'dev' Mario 2019-02-12 08:45:48 +01:00
  • cbf6d53e84 Get all listeners M.Dent 2019-02-11 20:24:17 -05:00
  • 5f012c5dc9 Merge branch 'origin' into 'master' harukin 2019-02-11 17:51:43 +09:00
  • 5e0ce96e49 Merge branch 'origin' into 'japanese' harukin 2019-02-11 17:51:12 +09:00
  • 4a2228a372 Merge branch 'origin' into 'develop' harukin 2019-02-11 17:48:25 +09:00
  • d9a0382539 edit translation harukin 2019-02-11 17:15:48 +09:00
  • f52a532771 use ACTIVITY_SHARE to match the verb Mario Vavti 2019-02-08 11:33:01 +01:00
  • efc4c53b44 missing use App Mario Vavti 2019-02-08 10:15:28 +01:00
  • 4837f9cdad Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2019-02-07 19:54:07 -08:00
  • 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. zotlabs 2019-02-07 14:38:05 -08:00
  • f02af5fe6e automatically redirect repeat to share for posts with unresolvable message-ids (diaspora, hz < 4.0, etc.). zotlabs 2019-02-07 14:25:25 -08:00
  • 92e6c21210 add missing zot6 conversation completion (required for message repeats) zotlabs 2019-02-07 14:13:13 -08:00
  • beb26e84f3 fix mid generation for shares zotlabs 2019-02-07 11:18:34 -08:00
  • 2b7a605223 exec updateInit() instead of notificationsUpdate() in jotShare() Mario Vavti 2019-02-07 09:55:22 +01:00
  • d70f0092f7 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-02-07 09:34:22 +01:00
  • 7f6e4a9744 fix verb for reshares zotlabs 2019-02-06 19:59:05 -08:00
  • 96a4fc7ca2 more work on share/repeat zotlabs 2019-02-06 19:26:28 -08:00
  • 29c1797493 work on repeat/share for Hubzilla zotlabs 2019-02-06 17:26:09 -08:00
  • 860dead985 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-02-06 06:46:05 +01:00
  • 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. zotlabs 2019-02-05 14:51:01 -08:00
  • 4bcddca1f0 Merge branch 'viewsrc_update' into 'dev' Max Kostikov 2019-02-04 10:38:26 +01:00
  • cf80f03084 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-02-04 10:03:38 +01:00
  • 47f31eed37 update tests for changes in handle_tags() zotlabs 2019-02-03 17:10:33 -08:00
  • 8ff9a9ff08 fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream. zotlabs 2019-02-03 16:53:49 -08:00
  • 8dcf27ba29 add the actual mid for debuging reasons Mario Vavti 2019-02-03 21:12:09 +01:00
  • d97043725d update changelog Mario Vavti 2019-02-03 15:12:38 +01:00
  • 90fd323ac5 bump version Mario 2019-02-03 15:03:56 +01:00
  • b6c384a0f7 cleanup logging and return if query returns empty result Mario Vavti 2019-02-03 13:58:19 +00:00
  • cda8a7be38 do not overwrite $sql_extra Mario Vavti 2019-02-03 13:52:50 +00:00
  • c657d766cf cleanup logging and return if query returns empty result Mario Vavti 2019-02-03 14:58:19 +01:00
  • 4706ff6938 do not overwrite $sql_extra Mario Vavti 2019-02-03 14:52:50 +01:00
  • c444af007f Merge branch 'core_fixes' into 'dev' M. Dent 2019-02-03 02:22:16 +01:00
  • 6e80bb49fb fix #1332 Mario Vavti 2019-02-02 22:11:26 +01:00
  • bf3d0c1274 Merge branch 'patch-20190201a' into 'dev' Mario 2019-02-02 20:50:40 +01:00
  • 0ded1d326c Merge branch 'dev' into 'dev' M. Dent 2019-02-01 18:01:01 +01:00
  • 708d288121 Add filter hooks and the ability to add buttons to the default status editor DM42.Net (Matt Dent) 2019-02-01 00:12:45 -05:00
  • 6462c83f69 Prevent Hubzilla usage for SEO backlinks Max Kostikov 2019-02-01 15:47:51 +01:00