Commit Graph

  • bc7f029b0b Merge branch 'develop' into 'master' master harukin 2019-12-29 14:08:49 +0900
  • 3a105cc339 Merge branch 'develop' into 'japanese' japanese harukin 2019-12-29 14:08:20 +0900
  • 6859053727 Revert "Revert "Merge branch 'develop' into 'origin'"" develop harukin 2019-12-29 13:31:01 +0900
  • bbcc9fe8d8 Revert "Merge branch 'develop' into 'origin'" origin harukin 2019-12-29 13:31:01 +0900
  • 8c207cf1eb Revert "Merge branch 'develop' into 'origin'" harukin 2019-12-29 13:31:01 +0900
  • bce8c2ee5a Merge branch 'origin' into 'develop' harukin 2019-12-29 13:33:15 +0900
  • e1922bd555 Merge branch 'develop' into 'origin' harukin 2019-12-29 13:31:01 +0900
  • 84d190f81a Merge branch 'japanese' into 'master' harukin 2019-12-29 13:11:47 +0900
  • fc9a901c4c Merge branch 'japanese' into 'develop' harukin 2019-12-29 13:10:22 +0900
  • 6f93d9848c Disable oembed in directory profile about Mario 2019-12-17 10:53:40 +0100
  • bde429cff6 Merge branch '4.6RC' Mario 2019-12-04 10:25:11 +0000
  • 4c8d33d1eb bump version Mario 2019-12-04 10:24:03 +0000
  • fac7826efa update changelog Mario 2019-12-04 10:14:28 +0000
  • 3e133bbfa3 Move auto_save_draft to header from thread comment DM42.Net Hubzilla Development 2019-11-28 05:27:12 +0000
  • 6c8d1bdffe Update CHANGELOG Max Kostikov 2019-11-25 21:25:44 +0000
  • 59fc495593 Update Russian hstrings.php Max Kostikov 2019-11-25 21:22:37 +0000
  • 60827bdcc4 Update Russian hmessages.po Max Kostikov 2019-11-25 21:22:17 +0000
  • f992feb71c update changelog Mario 2019-11-25 21:06:12 +0000
  • cf66e66db8 Merge branch '4.6RC' of https://framagit.org/hubzilla/core into 4.6RC Mario 2019-11-25 21:03:35 +0000
  • 63aa3948e5 resolve merge conflict Max Kostikov 2019-11-25 21:50:02 +0100
  • 7899ed6f69 Revert "Add daily cached embedded content cleanup" Max Kostikov 2019-11-25 13:32:58 +0000
  • 5e44239657 Add daily cached embedded content cleanup Max Kostikov 2019-11-25 13:16:07 +0000
  • 17cd452fff changelog Mario 2019-11-25 11:32:22 +0000
  • 004861fbb7 merge opengraph fixes from dev Mario 2019-11-25 08:41:34 +0000
  • 8727f12b18 no mention notifications from mastodon (and pleroma) Manuel Jiménez Friaza 2019-11-21 13:47:20 +0000
  • 05604e4bd2 onepoll: do not update dead feeds Mario 2019-11-15 10:01:21 +0000
  • fd7d497cd1 make inline pdf a security option, move thumbnail security to security options from admin/site Mario 2019-11-15 09:55:44 +0000
  • a974d0d52d AP fixes Mario 2019-11-15 09:43:39 +0000
  • c850a61a89 check if file exists Mario 2019-11-13 13:40:40 +0000
  • 3a2fdec241 wildcard tag issue zotlabs 2019-11-13 04:25:25 +0000
  • 08b804cd2d use minified version of jquery Mario 2019-11-11 10:17:03 +0000
  • de7891771d update strings Mario 2019-11-11 08:14:42 +0000
  • 602768209b bump version Mario 2019-11-11 08:06:44 +0000
  • 73b1f8fcdd Merge branch 'cherry-pick-1affcb80' into 'dev' Mario 2019-11-10 14:21:13 +0100
  • e1b923ab7d Merge branch 'cherry-pick-6685381f' into 'dev' Mario 2019-11-10 14:18:18 +0100
  • bed9876d68 Merge branch 'cherry-pick-9ad4c652' into 'dev' Mario 2019-11-10 14:17:58 +0100
  • d184e2708f fix language tests Mario 2019-11-10 13:04:13 +0000
  • 580c3f4ffe another bulk of composer updates Mario 2019-11-10 12:49:51 +0000
  • 158b8aea38 hopefully fix query for postgres Mario 2019-11-10 10:49:44 +0000
  • d22766f458 Merge branch 'cherry-pick-971e7eef' into 'dev' Max Kostikov 2019-11-10 11:55:05 +0100
  • 70391243dc Merge branch 'cherry-pick-b444bf59' into 'dev' Max Kostikov 2019-11-10 11:54:43 +0100
  • 61eef68ff3 Ãremove some old unused javascript libraries Mario 2019-11-10 08:55:35 +0000
  • 41cc2854c5 update jquery to version 3.4.1 Mario 2019-11-10 08:54:37 +0000
  • 478014f02a Better BBcode to Markdown conversion Max Kostikov 2019-11-08 23:35:05 +0100
  • aff7c2d771 Merge branch 'dev' into 'dev' M. Dent 2019-11-08 23:30:30 +0100
  • 00dd52317a Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-11-08 13:10:24 -0800
  • 17522b31e9 exempt svg from tag completion zotlabs 2019-11-08 13:07:42 -0800
  • 163b1ee9f8 Merge branch 'cherry-pick-fa437b79' into 'dev' Max Kostikov 2019-11-08 21:35:06 +0100
  • 7b9a992f83 more fix date header format Mario 2019-11-08 20:26:29 +0000
  • 4efb258671 Merge branch 'cherry-pick-bb11cd15' into 'dev' Max Kostikov 2019-11-08 21:26:54 +0100
  • 7532358806 fix date header format Mario 2019-11-08 20:12:06 +0000
  • 13c05e7937 Merge branch 'dev' into 'dev' Max Kostikov 2019-11-08 18:13:52 +0100
  • c6e9bca76c Merge branch 'cherry-pick-2df15f35' into 'dev' Max Kostikov 2019-11-08 18:13:27 +0100
  • 3706afbd01 Do not trim a sufficiently shortened Opengraph description Max Kostikov 2019-11-08 16:19:08 +0100
  • bcd0802ea4 update composr libs Mario 2019-11-08 09:46:23 +0000
  • 9360148829 Merge branch 'dev' into 'dev' Mario 2019-11-08 10:47:00 +0100
  • a6165c00ce svg stuff Zot 2019-11-08 10:47:00 +0100
  • a5826fec25 svg stuff zotlabs 2019-11-07 14:51:29 -0800
  • 839c6668cf Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-11-07 14:48:44 -0800
  • e9a9fc5050 Merge branch 'dev' into 'dev' Max Kostikov 2019-11-07 14:24:19 +0100
  • 426668cd2e Update hstrings.php Max Kostikov 2019-11-07 14:14:41 +0100
  • 926d7c56a6 Update hmessages.po Max Kostikov 2019-11-07 14:13:29 +0100
  • 9934dbfe69 Merge branch 'dev' into 'dev' Mario 2019-11-07 09:14:51 +0100
  • b6314c109d Sanitize title on Atom/RSS feed import Max Kostikov 2019-11-07 09:14:51 +0100
  • f8955f90b8 Move title sanitizer code in the right place Max Kostikov 2019-11-06 16:14:57 +0100
  • 9248fc96b3 Formatting Max Kostikov 2019-11-06 16:11:10 +0100
  • 2875ee2423 Update feedutils.php Max Kostikov 2019-11-06 16:08:36 +0100
  • 36f707b25e Sanitize title on Atom/RSS feed import Max Kostikov 2019-11-06 16:07:04 +0100
  • 2a05bd9ed6 Merge branch 'cherry-pick-7cc8c2d1' into 'dev' M. Dent 2019-11-06 04:13:57 +0100
  • b7db9944ec Merge branch 'cherry-pick-3604220c' into 'dev' M. Dent 2019-11-06 04:11:12 +0100
  • 86f7d08483 Merge branch 'dev' into 'dev' M. Dent 2019-11-06 04:10:16 +0100
  • 1358a81c32 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-11-04 14:26:12 -0800
  • 09ad48c12b Prefer use Etag on photo modification validation Max Kostikov 2019-11-04 21:44:42 +0100
  • aa137fb2d2 Merge branch 'cherry-pick-4cfb9658' into 'dev' M. Dent 2019-11-04 20:01:14 +0100
  • 09284d512d Merge branch 'cherry-pick-03317b98' into 'dev' M. Dent 2019-11-04 19:58:01 +0100
  • 02fd7e51ff add date and request target headers to make pixelfed happy Mario 2019-11-04 11:33:16 +0000
  • b359b89aa1 port fixes from zap to check for arrays Mario 2019-11-04 11:14:44 +0000
  • 873b20677e fix duplicate attachment and regression with audio file upload Mario 2019-11-04 09:31:07 +0000
  • a049664219 fix query with protocol prefix not always picking the right xchan Mario 2019-11-04 08:35:36 +0000
  • 64c6e25896 Merge branch 'cherry-pick-4a1c2208' into 'dev' Max Kostikov 2019-11-03 14:03:00 +0100
  • 9f9122ab8e fix issue #1402 Mario 2019-11-03 10:14:23 +0000
  • d0661cd4a3 Merge branch 'commentsclosed-hook' into 'dev' Mario 2019-11-03 10:12:12 +0100
  • 707b19dc35 Add hook to comments_are_now_closed() M. Dent 2019-11-03 10:12:11 +0100
  • 6fd15d66a7 Merge branch 'dev' into 'dev' Max Kostikov 2019-11-02 10:42:02 +0100
  • 8c9a814e18 Merge branch 'homeinstall_fix_addons' into 'dev' Max Kostikov 2019-11-02 10:37:59 +0100
  • 74ef5f38e9 Fix start time to sync queries on photo cache purge Max Kostikov 2019-11-02 10:36:04 +0100
  • 624a3ee1a7 homeinstall fix addons root 2019-11-01 23:01:42 +0100
  • fc658a25d7 Update schema_mysql.sql Max Kostikov 2019-11-01 19:37:46 +0100
  • 308619a726 Drop llink index Max Kostikov 2019-11-01 17:47:16 +0100
  • e87d8d9856 Change llink column type and drop index Max Kostikov 2019-11-01 17:46:28 +0100
  • 7594264725 Merge branch 'dev' into 'dev' Max Kostikov 2019-11-01 10:49:19 +0100
  • 69533ce8f5 Add missed interval in SQL query Max Kostikov 2019-11-01 10:46:49 +0100
  • 9fac43a3a3 Better photo cache expiry processing Max Kostikov 2019-11-01 10:34:02 +0100
  • 972270ff3e fix plural code harukin 2019-10-27 09:44:24 +0900
  • b00db39739 Merge branch 'dev' into 'dev' Max Kostikov 2019-10-26 12:30:41 +0200
  • 6f2a584279 Update Photo.php Max Kostikov 2019-10-26 12:24:23 +0200
  • de717268f7 Better cached photos processing Max Kostikov 2019-10-26 12:22:09 +0200
  • e27b19c756 fix hardcoded code/pre css in mod admin Mario 2019-10-22 11:28:44 +0000
  • 045cb461f1 fix encoding issue Mario 2019-10-22 08:38:55 +0000
  • 088c0eedc6 Merge branch 'patch-1' into 'dev' Max Kostikov 2019-10-19 23:28:58 +0200