Commit Graph

  • dffc0a4ed8 changelog Mario Vavti 2018-11-19 10:10:22 +00:00
  • ba4b1cb5af Merge branch 'master' of https://framagit.org/hubzilla/core Mario Vavti 2018-11-19 11:10:36 +01:00
  • 5cb4cdaa5e changelog Mario Vavti 2018-11-19 11:10:22 +01:00
  • 0525eb2d29 update sql schemas to include update column in pconfig table Mario Vavti 2018-11-19 09:42:18 +00:00
  • 7be1d9e45a Merge branch 'patch-20181118a' into 'dev' Mario 2018-11-19 09:44:41 +00:00
  • f34af496ec Merge branch 'patch-20181118a' into 'dev' Mario 2018-11-19 10:44:41 +01:00
  • ae97649948 update sql schemas to include update column in pconfig table Mario Vavti 2018-11-19 10:42:18 +01:00
  • 3787c490d4 Fix: delayed items propagate before publication on cloned channels DM42.Net (Matt Dent) 2018-11-18 07:00:06 -05:00
  • c3f1aae570 Merge branch 'mod-zot-fix' into 'dev' Max Kostikov 2018-11-18 11:21:07 +01:00
  • 0c94747ab1 fix typo which prevented propagation of comments Mario Vavti 2018-11-18 11:02:01 +01:00
  • 783cca1e13 recalculate photo filesize when rotating an image Mario Vavti 2018-11-17 08:41:26 +00:00
  • f15e32d063 recalculate photo filesize when rotating an image Mario Vavti 2018-11-17 09:41:26 +01:00
  • 238a616292 Add filesize for streaming content Max Kostikov 2018-11-16 23:33:45 +01:00
  • 6010b5c619 Fix return on wrong sotred in Content-Length size for full size photos Max Kostikov 2018-11-16 23:14:10 +01:00
  • 4812c5486d strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead. Mario Vavti 2018-11-16 21:14:11 +00:00
  • afc75af62f strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead. Mario Vavti 2018-11-16 22:14:11 +01:00
  • 23b30fdd10 Merge branch 'dev_homeinstall_raspihub' into 'dev' Mario 2018-11-16 11:30:53 +01:00
  • 2778a7220f Merge branch 'master' into 'master' Mario 2018-11-16 10:29:45 +01:00
  • c69556f2ff Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-11-16 10:11:46 +01:00
  • b0689614bf datetime_convert wrong args zotlabs 2018-11-15 21:14:14 -08:00
  • e42a401987 more work on the mid/uuid conversion zotlabs 2018-11-15 20:50:47 -08:00
  • 5162459e4a delivery report issue zotlabs 2018-11-15 18:07:58 -08:00
  • 39d914c9df add item.uuid to relevant places zotlabs 2018-11-15 16:34:09 -08:00
  • 8d2f4d9dfd mid -> uuid conversions for basic reactions zotlabs 2018-11-15 16:02:29 -08:00
  • a7d2f9b530 remove checkjs and nojs zotlabs 2018-11-15 15:35:06 -08:00
  • 26f593afaa delivery issue zotlabs 2018-11-15 13:52:25 -08:00
  • ca4e7f9b4f fix update 1228 Mario Vavti 2018-11-15 10:11:04 +01:00
  • b11858bcac separate by network zotlabs 2018-11-14 20:34:00 -08:00
  • 034f23b47e update httpsig unit test which is failing zotlabs 2018-11-14 19:09:18 -08:00
  • 9c25f300cf fixes to old z6 delivery zotlabs 2018-11-14 18:56:38 -08:00
  • db4ff56f0b more logging zotlabs 2018-11-14 18:41:36 -08:00
  • 830c2472cb more logging zotlabs 2018-11-14 18:39:23 -08:00
  • 079e2af0c0 check keyid zotlabs 2018-11-14 18:33:00 -08:00
  • 5f166158c3 filter by network zotlabs 2018-11-14 18:25:02 -08:00
  • 4a06378d67 crypto fix zotlabs 2018-11-14 18:19:35 -08:00
  • d0f0a74df8 encrypted header issue zotlabs 2018-11-14 18:14:47 -08:00
  • 65a8965e85 extra logging zotlabs 2018-11-14 18:07:39 -08:00
  • ab2376f8d8 fix dreport link zotlabs 2018-11-14 17:42:02 -08:00
  • 48717dff00 change db update counter zotlabs 2018-11-14 16:56:07 -08:00
  • b64dd7ab57 Merge branch 'master' into zvi zotlabs 2018-11-14 16:42:03 -08:00
  • bf013ecf00 db updates for zot6 zotlabs 2018-11-14 16:40:30 -08:00
  • 22b744fa23 Merge remote-tracking branch 'official/dev' into dev_homeinstall_raspihub OJ Random 2018-11-14 17:32:24 +01:00
  • f560fe3b37 Merge branch 'develop' into 'master' harukin 2018-11-15 00:34:04 +09:00
  • 839a29a2a6 Merge branch 'develop' into 'japanese' harukin 2018-11-15 00:33:51 +09:00
  • 81bc44b30f 利用規約追加 harukin 2018-11-15 00:33:51 +09:00
  • 58083ccb0c harukin 2018-11-15 00:28:19 +09:00
  • 71cc2d7d5d localhost, URLs, version updates OJ Random 2018-11-14 16:27:27 +01:00
  • 976a4da0a1 harukin 2018-11-15 00:25:55 +09:00
  • 74c48e5906 利用規約追加 harukin 2018-11-15 00:24:20 +09:00
  • d7f0b130ce Merge branch 'develop' into 'master' harukin 2018-11-14 19:53:29 +09:00
  • 1d0ad72800 Merge branch 'develop' into 'japanese' harukin 2018-11-14 19:51:21 +09:00
  • 23b65c8e6e Merge Upstream to here. 3.8.4 harukin 2018-11-14 19:45:51 +09:00
  • 62b367fa81 version 3.9.5 Mario Vavti 2018-11-14 11:22:41 +01:00
  • beac45b075 more changelog Mario Vavti 2018-11-14 11:20:39 +01:00
  • dfc5159aa3 Merge branch 'dev' Mario Vavti 2018-11-14 11:12:20 +01:00
  • 886cdb440b changelog and version Mario Vavti 2018-11-14 11:08:25 +01:00
  • 6ed9443972 Merge branch 'patch-20181113b' into 'dev' Mario 2018-11-14 09:30:54 +01:00
  • 08e0f172de Merge branch 'dev' into 'dev' Mario 2018-11-14 09:30:28 +01:00
  • cfc43f6dea Merge branch 'master' into zvi zotlabs 2018-11-13 20:37:52 -08:00
  • f1d168f781 Fix double escaping after xss fix DM42.Net (Matt Dent) 2018-11-13 23:06:00 -05:00
  • 302d9796c4 Revert "Filter search box before display" DM42.Net (Matt Dent) 2018-11-13 22:59:36 -05:00
  • ee85784be1 stay ahead of the game zotlabs 2018-11-13 19:55:43 -08:00
  • 1260887fa7 Merge branch 'patch-20181113a' into 'dev' M. Dent 2018-11-14 03:21:32 +01:00
  • ce8073d25e Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix to search xss and Superblock fix. DM42.Net (Matt Dent) 2018-11-13 20:19:12 -05:00
  • 31f4d9066b xss in search zotlabs 2018-11-13 14:23:56 -08:00
  • 35e66770be Filter search box before display DM42.Net (Matt Dent) 2018-11-13 17:20:21 -05:00
  • cf2f7f2132 Update Photo.php Max Kostikov 2018-11-13 12:52:35 +01:00
  • a145559662 Remove uneccessary include/photos.php Max Kostikov 2018-11-13 11:45:18 +01:00
  • d029e3dc16 Text formatting in Photo.php Max Kostikov 2018-11-13 11:39:42 +01:00
  • 286326a98e Replace fetch_image_from_url() with z_fetch_url() Max Kostikov 2018-11-13 11:38:49 +01:00
  • 2f59d78737 Remove fetch_image_from_url() because of functions duplicate Max Kostikov 2018-11-13 11:37:32 +01:00
  • adf4782076 Merge branch 'revert-6375f2d7' into 'dev' Max Kostikov 2018-11-13 11:36:02 +01:00
  • b38ffef2be Revert "Replace fetch_image_from_url() with z_fetch_url()" Max Kostikov 2018-11-13 11:25:46 +01:00
  • 6375f2d73a Replace fetch_image_from_url() with z_fetch_url() Max Kostikov 2018-11-13 11:25:14 +01:00
  • 1a2df9c51c item uuid changes zotlabs 2018-11-12 18:25:55 -08:00
  • 770fdb2b7d dreport updates zotlabs 2018-11-12 16:08:22 -08:00
  • a7d3a49171 Merge branch 'fix-activity-filter-widget' into 'dev' M. Dent 2018-11-12 21:50:08 +01:00
  • 920e7db709 Merge branch 'css-fixes' into 'dev' M. Dent 2018-11-12 21:49:07 +01:00
  • 4a6b45cf04 enotify::format hook for superblock zotlabs 2018-11-12 11:13:36 -08:00
  • 7bd60adfbe fix css issues in bbcode conversion and focus-light schema Mario Vavti 2018-11-12 09:35:12 +01:00
  • 171ff54ea4 translate zot message packets to zot6 for delivery zotlabs 2018-11-11 21:55:10 -08:00
  • da452decf6 more z6 debugging zotlabs 2018-11-11 15:12:01 -08:00
  • c335719e8f use the correct javascript function for this case Mario Vavti 2018-11-11 14:46:35 +01:00
  • d57cdf645e Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-11-11 14:01:25 +01:00
  • e47a96bf24 Merge branch 'dev' into 'dev' Mario 2018-11-11 13:49:29 +01:00
  • daad607c7c Merge branch 'dev' into 'dev' Mario 2018-11-11 13:47:03 +01:00
  • 29f1f9c872 Merge branch 'dev' into 'dev' Max Kostikov 2018-11-10 20:47:35 +01:00
  • a49cfa8142 Update photo_driver.php Max Kostikov 2018-11-10 20:45:20 +01:00
  • b57d296adc Preserve photo modification date Max Kostikov 2018-11-10 20:35:14 +01:00
  • 01d8bd445e Merge branch 'dev' into 'dev' Mario 2018-11-10 15:02:27 +01:00
  • 04e220cc4b Merge branch 'develop' into 'japanese' harukin 2018-11-10 21:34:03 +09:00
  • cb70c48b36 Merge branch 'develop' into 'master' harukin 2018-11-10 21:31:11 +09:00
  • 750d6f4be9 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-11-10 12:22:09 +01:00
  • c6e14a696e Fixed wrong value assign on compare with 0 Max Kostikov 2018-11-10 11:56:34 +01:00
  • d34423fce9 Fixed wrong value assign on compare with 0 Max Kostikov 2018-11-10 11:53:49 +01:00
  • 4999547f87 Merge branch 'dev' into 'dev' Mario 2018-11-10 11:47:20 +01:00
  • fc5dc9717a fix shared_header img expanding to 100% width when sharing a share Mario Vavti 2018-11-10 11:31:06 +01:00
  • d20759c141 Do not return default images from vCard Max Kostikov 2018-11-10 11:11:23 +01:00
  • f7b00c62a4 Remove unnecessary Zulu timezone mention Max Kostikov 2018-11-10 10:05:28 +01:00
  • 32873ce70d Preserve received image modification date on caching Max Kostikov 2018-11-09 22:20:41 +01:00