harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 5fb0d38ad8 security updates for multiple xchans zotlabs 2019-03-11 16:29:12 -07:00
  • 9ed5cddb89 Merge branch 'dev' into 'dev' Mario 2019-03-11 09:38:27 +01:00
  • 4e97fb0e58 testing init_groups_visitor changes - also add virtual groups for both zot identities zotlabs 2019-03-10 22:32:37 -07:00
  • 1688e373bc Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-03-10 15:52:07 -07:00
  • cada0b6df1 init_groups_visitor: include xchans from all zot-like networks zotlabs 2019-03-10 15:50:45 -07:00
  • 91358010a0 Merge branch 'dev' into 'dev' Mario 2019-03-10 11:40:33 +01:00
  • 51024d3821 authenticated fetch fixes zotlabs 2019-03-09 12:58:03 -08:00
  • b329d998ca Merge branch 'japanese' into 'develop' harukin 2019-03-09 18:03:04 +09:00
  • 482f1dba27 Merge branch 'japanese' into 'master' harukin 2019-03-09 18:02:35 +09:00
  • 23fc7e65d4 Merge branch 'origin' into 'master' harukin 2019-03-09 17:59:08 +09:00
  • 8f594ad6d9 Merge branch 'origin' into 'japanese' harukin 2019-03-09 17:58:02 +09:00
  • d8d46039a2 Merge branch 'origin' into 'develop' harukin 2019-03-09 17:48:31 +09:00
  • 19e1325604 edit translation harukin 2019-03-09 17:36:26 +09:00
  • 220d6ed494 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-03-08 14:56:13 -08:00
  • b5ed3edc8f port zot_record_preferred zotlabs 2019-03-08 14:51:30 -08:00
  • 9772726065 merge text.php and hmessages.po Mario Vavti 2019-03-08 12:32:20 +01:00
  • 8ecdde6cb5 Merge branch '4.0RC' Mario Vavti 2019-03-08 11:52:57 +01:00
  • 73c96f35c1 update changelog Mario Vavti 2019-03-08 10:48:01 +00:00
  • 5b3824917d update changelog Mario Vavti 2019-03-08 11:48:01 +01:00
  • ca4f10dc5e bump version Mario Vavti 2019-03-08 11:46:36 +01:00
  • 853fb33913 $sender is supposed to be string in libzot Mario 2019-03-08 04:45:02 +00:00
  • e352cfc861 fetch private objects using delivery channel credentials zotlabs 2019-03-07 23:45:42 +00:00
  • b8d79d9132 Merge branch 'core_fixes_1' into 'dev' M. Dent 2019-03-08 05:45:02 +01:00
  • 507c71f64c $sender is supposed to be string in libzot Mario 2019-03-08 05:45:02 +01:00
  • ce0067d8eb It is in fact the 'Content Import' app string that needs to be translated. A previous commit errantly included the string 'Content Filter'. But don't remove 'Content Filter'. That is actually a thing in Zap and will eventually make its way to Hubzilla. zotlabs 2019-03-07 20:01:41 -08:00
  • c0b238b19a Merge branch 'dev' into 'dev' M. Dent 2019-03-08 02:48:03 +01:00
  • d961cf21fb Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-03-07 16:05:15 -08:00
  • 1f7622e4c4 fetch private objects using delivery channel credentials zotlabs 2019-03-07 15:45:42 -08:00
  • b019ca0746 update changelog Mario Vavti 2019-03-07 08:32:12 +00:00
  • 04fe7e61de update changelog Mario Vavti 2019-03-07 09:32:12 +01:00
  • beb4e00afb guest access tokens: xchan record not created on URL login zotlabs 2019-03-07 03:01:28 +00:00
  • 3e6607585f Merge branch 'dev' into 'dev' Mario 2019-03-07 09:29:21 +01:00
  • 0b2213dd41 guest access tokens: xchan record not created on URL login zotlabs 2019-03-06 19:01:28 -08:00
  • 9450305568 changelog Mario Vavti 2019-03-06 20:08:56 +00:00
  • 08725c44c6 changelog Mario Vavti 2019-03-06 21:08:56 +01:00
  • e18c64c9d9 bump version Mario Vavti 2019-03-06 10:02:33 +01:00
  • 7b018c60cb while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash) Mario Vavti 2019-03-02 14:50:53 +00:00
  • a81286c795 Add CURLOPT_CONNECTTIMEOUT M. Dent 2019-03-06 08:52:26 +00:00
  • 75a66b716e Merge branch 'patch-20190305a' into 'dev' Mario 2019-03-06 09:52:26 +01:00
  • 0c05e6593e Add CURLOPT_CONNECTTIMEOUT M. Dent 2019-03-06 09:52:26 +01:00
  • 571e9bf26a channel_type is not integer zotlabs 2019-03-06 01:06:42 +00:00
  • c4714e95b6 maintain compatibility with recent zot6 changes zotlabs 2019-03-06 00:57:32 +00:00
  • c43ab50d66 Merge branch 'dev' into 'dev' Mario 2019-03-06 09:47:40 +01:00
  • 0d283b2666 edit translation harukin 2019-03-06 10:32:47 +09:00
  • 26e7da0b96 channel_type is not integer zotlabs 2019-03-05 17:06:42 -08:00
  • 98b1c7a38c maintain compatibility with recent zot6 changes zotlabs 2019-03-05 16:57:32 -08:00
  • d407e5556e api_router - allow parameters as final path argument zotlabs 2019-03-05 04:11:43 +00:00
  • 6a3cfe54af remove clones from delivery recipients for top-level posts - they will get the post via clone sync zotlabs 2019-03-05 04:09:47 +00:00
  • a0bffe4a78 mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode zotlabs 2019-03-05 04:07:01 +00:00
  • 336c716a44 translate name of content filter (addon) app. zotlabs 2019-03-01 01:51:13 +00:00
  • ccdbec619c Merge branch 'dev' into 'dev' Mario 2019-03-05 09:40:45 +01:00
  • 47001c3303 api_router - allow parameters as final path argument zotlabs 2019-03-04 20:11:43 -08:00
  • 8e50fecccc remove clones from delivery recipients for top-level posts - they will get the post via clone sync zotlabs 2019-03-04 20:09:47 -08:00
  • 938fcdd1a6 mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode zotlabs 2019-03-04 20:07:01 -08:00
  • 9ede57b228 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-03-04 14:50:33 -08:00
  • 8810658858 Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de' mike 2019-03-03 15:24:36 +00:00
  • e074d02714 Merge branch 'dev' into 'dev' Mario 2019-03-04 09:50:12 +01:00
  • e26de9c1d1 Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de' mike 2019-03-03 18:24:36 +03:00
  • 7dc3835a54 Merge branch 'core_fixes' into 'dev' M. Dent 2019-03-03 03:37:33 +01:00
  • 117a8cafca while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash) Mario Vavti 2019-03-02 15:50:53 +01:00
  • 337dfd5ee4 Mention php-zip module dependency in administrator guide mike 2019-03-02 09:21:59 +00:00
  • e37c9ed0a1 Use sender hash DM42.Net (Matt Dent) 2019-03-01 15:50:10 +00:00
  • aa6a31eba5 iron out some kinks with scrollToItem() in combination with collapsed content and images Mario Vavti 2019-03-01 13:16:19 +00:00
  • 8a0a0aef5c Merge branch 'dev' into 'dev' Mario 2019-03-02 15:01:50 +01:00
  • 4750e15c20 Merge branch 'patch-20190301a' into 'dev' Mario 2019-03-02 15:00:20 +01:00
  • 747ce9b1f1 Mention php-zip module dependency in administrator guide mike 2019-03-02 12:21:59 +03:00
  • 7fa874d9ef Merge branch 'js_fixes' into 'dev' M. Dent 2019-03-01 17:43:16 +01:00
  • 5febc3e07d Use sender hash DM42.Net (Matt Dent) 2019-03-01 10:50:10 -05:00
  • 2244bf2ba2 iron out some kinks with scrollToItem() in combination with collapsed content and images Mario Vavti 2019-03-01 14:16:19 +01:00
  • 29cb62af3d translate name of content filter (addon) app. zotlabs 2019-02-28 17:51:13 -08:00
  • 027847a663 Merge branch 'develop' into 'master' harukin 2019-02-27 11:19:32 +09:00
  • 8134ba1faf add cmd support test harukin 2019-02-27 10:53:11 +09:00
  • d30748f1de edit translation harukin 2019-02-27 10:47:05 +09:00
  • 6aa041b193 version Mario Vavti 2019-02-26 09:30:54 +01:00
  • 0fdc0a01d0 Merge branch 'dev' into 4.0RC Mario Vavti 2019-02-26 09:29:00 +01:00
  • de7f2eef47 use $channel_id until the function is adapted to not need it Mario Vavti 2019-02-26 09:28:16 +01:00
  • a449ffe49d Merge branch 'fix-sync_an_item' into 'dev' Mario 2019-02-26 09:26:00 +01:00
  • 08cacc4943 Merge branch 'dev' into 4.0RC Mario Vavti 2019-02-26 09:06:46 +01:00
  • 04b9216758 Merge branch 'dev' into 'dev' Mario 2019-02-25 14:06:37 +01:00
  • 1ff97754af issues uncovered testing combined item/file import zotlabs 2019-02-24 21:43:15 -08:00
  • 20e43311db zot api changes to support combined content (items+files) import addon zotlabs 2019-02-24 14:46:09 -08:00
  • 89bcb1de42 Merge branch 'js_fixes' into 'dev' M. Dent 2019-02-24 03:32:39 +01:00
  • 7a1a44f802 xchan_query and fetch_post_tags uses full query results not a single row DM42.Net (Matt Dent) 2019-02-23 21:03:05 -05:00
  • e9edec0875 edit translation harukin 2019-02-24 09:19:28 +09:00
  • 06aa32db22 fix regression from commit 04ec35d9cc where selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true Mario Vavti 2019-02-23 21:48:45 +01:00
  • 6f8593cf47 Fixes - sync item based on item's user DM42.Net (Matt Dent) 2019-02-23 10:24:05 -05:00
  • 3b2efb1000 Fix misspelled variable DM42.Net (Matt Dent) 2019-02-23 10:09:58 -05:00
  • 87482e3746 Update PHP Version check during Setup. Klaus Weidenbach 2019-02-21 19:07:46 +00:00
  • ef6a280019 Merge branch 'php' into 'dev' Mario 2019-02-22 12:51:48 +01:00
  • 326ae05b06 Merge branch 'es-es' into 'dev' Max Kostikov 2019-02-22 11:32:33 +01:00
  • 3f13c85b64 Update PHP Version check during Setup. Klaus Weidenbach 2019-02-21 20:07:46 +01:00
  • 1ae7bd6477 Merge branch 'cherry-pick-f92d2e3f' into 'es-es' Manuel Jiménez Friaza 2019-02-21 18:55:39 +01:00
  • c91641aa83 Quickfix es-es/hstrings.php Manuel Jiménez Friaza 2019-02-21 17:32:45 +00:00
  • f92d2e3f7c Quickfix es-es/hstrings.php Manuel Jiménez Friaza 2019-02-21 18:32:45 +01:00
  • 3e2489465f Merge branch 'cherry-pick-a9b75d05' into 'es-es' Manuel Jiménez Friaza 2019-02-21 12:59:29 +01:00
  • a5bf32a97d Fix es-es/hstrings.php Manuel Jiménez Friaza 2019-02-21 11:40:27 +00:00
  • 8bb2d29a8d Update Spanish translation Manuel Jiménez Friaza 2019-02-21 10:30:17 +00:00
  • a9b75d059b Fix es-es/hstrings.php Manuel Jiménez Friaza 2019-02-21 12:40:27 +01:00
  • 938e8110ca Merge branch 'es-es' into 'dev' Mario 2019-02-21 12:34:31 +01:00
  • 93039081d5 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 07:48:47 +00:00