Commit Graph

  • 618d673947 Merge remote-tracking branch 'upstream/dev' into dev Manuel Jiménez Friaza 2018-12-13 12:34:04 +01:00
  • 6464099364 regression: the ability to order apps messed up since adding pinned apps to the ordering zotlabs 2018-12-12 19:11:30 -08:00
  • 7c19f0cca7 edit translation harukin 2018-12-12 11:42:46 +09:00
  • c2181c23ef edit translation harukin 2018-12-12 11:31:05 +09:00
  • 3cf145aa6a edit translation harukin 2018-12-11 23:01:28 +09:00
  • 6bea3d6bfc Merge branch 'fix_photo_imagick' into 'dev' Max Kostikov 2018-12-11 13:31:34 +01:00
  • 993db01400 return on readImageBlob() exception Mario Vavti 2018-12-11 12:21:09 +01:00
  • f2d078e3cd edit translation harukin 2018-12-11 10:02:20 +09:00
  • 4cb4f17500 Merge branch 'photo-hook' into 'dev' M. Dent 2018-12-10 21:49:12 +01:00
  • 15a689c6f5 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-10 10:38:06 +01:00
  • 7894fed741 add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error Mario Vavti 2018-12-10 10:37:29 +01:00
  • 61f7c1e7d7 Merge branch 'dark-theme-dev' into 'dev' M. Dent 2018-12-10 05:36:58 +01:00
  • 30efeb5bec home notifications won't expand if there are more than 300 unseen network notifications ahead of them. zotlabs 2018-12-09 20:24:04 -08:00
  • 18caf0273f change redbasic dark schema to make categories and highlights readable phani00 2018-12-10 03:03:28 +00:00
  • 214b81e491 rmagic discovery for z6 networks zotlabs 2018-12-09 16:37:15 -08:00
  • e60fb17524 total_identities restriction off by one zotlabs 2018-12-09 11:20:57 -08:00
  • 4f1fdf85c8 edit translation harukin 2018-12-09 13:31:34 +09:00
  • 33865993db edit translation harukin 2018-12-09 13:29:24 +09:00
  • 5a27aaef24 edit translation harukin 2018-12-06 22:10:55 +09:00
  • 7f65d82a74 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-06 12:50:23 +01:00
  • 8ab1f31058 reset page title if article has no title. zotlabs 2018-12-05 16:24:30 -08:00
  • 4cd5529027 Merge remote-tracking branch 'upstream/dev' into dev Manuel Jiménez Friaza 2018-12-05 12:32:33 +01:00
  • 770036c5a8 Merge branch 'develop' into 'japanese' harukin 2018-12-04 23:55:59 +09:00
  • d38b75900a Merge branch 'develop' into 'master' harukin 2018-12-04 23:55:47 +09:00
  • e8acf7e87a merge from upsream 3.8.6 release harukin 2018-12-04 23:52:59 +09:00
  • 2a4aea67b8 edit translation harukin 2018-12-04 23:47:09 +09:00
  • d12744011a Merge branch 'dev' into 'dev' Max Kostikov 2018-12-04 11:50:04 +01:00
  • c0e4c92d47 Update hstrings.php Max Kostikov 2018-12-04 11:41:59 +01:00
  • cc3e910194 Update hmessages.po Max Kostikov 2018-12-04 11:41:42 +01:00
  • 5d9f993352 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-12-04 11:39:14 +01:00
  • eaa52c19a8 Merge branch 'photocache' into 'dev' Mario 2018-12-04 11:38:58 +01:00
  • 42aeb19562 partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld'] zotlabs 2018-12-03 20:09:57 -08:00
  • ffc3dba682 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-12-03 19:19:31 -08:00
  • 1acc5ceb5f more merging zotlabs 2018-12-03 19:18:20 -08:00
  • 7d694dca07 more work on z6 commenting zotlabs 2018-12-03 18:50:45 -08:00
  • 7a693500c4 fix generated plink zotlabs 2018-12-03 14:21:33 -08:00
  • 1c44912aff Update Photo.php Max Kostikov 2018-12-03 21:33:32 +01:00
  • 5e14da67e1 quickfix for es-es language Mario Vavti 2018-12-03 20:22:02 +00:00
  • 6b68a76bbe quickfix for es-es language Mario Vavti 2018-12-03 21:22:02 +01:00
  • b586fcebab Update Photo.php Max Kostikov 2018-12-03 21:21:23 +01:00
  • 244c0d828a Update Photo.php Max Kostikov 2018-12-03 13:29:27 +01:00
  • 57ebd7e170 New logic for less dependence on cache logic Max Kostikov 2018-12-03 13:10:55 +01:00
  • 8f10b58cb1 version 3.8.6 Mario Vavti 2018-12-03 12:23:55 +01:00
  • f8bc408abc update strings Mario Vavti 2018-12-03 12:07:56 +01:00
  • f581f6163a optimize autoload cache Mario Vavti 2018-12-03 11:52:38 +01:00
  • 5776471547 changelog Mario Vavti 2018-12-03 10:47:28 +00:00
  • 88486a1278 changelog Mario Vavti 2018-12-03 11:47:28 +01:00
  • 9fcadc2d7c prevent incompatible export files (osada/zap) from being imported (manual patch from dev) Mario Vavti 2018-12-03 11:08:39 +01:00
  • c50e3a702a more notifications fixes Mario Vavti 2018-12-03 09:46:49 +00:00
  • 2173ef5fb6 catch exception if readImageBlob() receives bogus data Mario Vavti 2018-12-03 09:45:43 +00:00
  • 9ef6c57ca5 more notifications fixes Mario Vavti 2018-12-03 10:46:49 +01:00
  • 443d7684db catch exception if readImageBlob() receives bogus data Mario Vavti 2018-12-03 10:45:43 +01:00
  • 1f6da1c653 Merge branch 'photocache' into 'dev' Max Kostikov 2018-12-03 00:57:52 +01:00
  • c165894ce9 Add Expires field support Max Kostikov 2018-12-03 00:51:09 +01:00
  • 19903ea3c1 Add flag to allow to save image without validation Max Kostikov 2018-12-02 21:59:08 +01:00
  • 0b38ab259c Merge branch 'photocache' into 'dev' M. Dent 2018-12-02 19:33:54 +01:00
  • 5d82037ffb edit translation harukin 2018-12-02 20:36:14 +09:00
  • a41713febb edit translation harukin 2018-12-02 20:29:11 +09:00
  • 5002d8e1fa edit translation harukin 2018-12-02 19:59:58 +09:00
  • 237c6eed50 fallback to url if we have not got an addr Mario Vavti 2018-12-02 10:38:13 +00:00
  • a3ba7f0788 fallback to url if we have not got an addr Mario Vavti 2018-12-02 11:38:13 +01:00
  • f13b1e8604 fix filtering by addr in handleNotificationsItems() Mario Vavti 2018-12-02 09:58:54 +00:00
  • f083c0cba1 fix filtering by addr in handleNotificationsItems() Mario Vavti 2018-12-02 10:58:54 +01:00
  • defa2d9df1 make pdf preview 100% width and 300px height to match it openstreetmaps preview Mario Vavti 2018-12-01 20:37:33 +00:00
  • 05c422ef23 redbasic sticky aside fixes Mario Vavti 2018-12-01 20:30:18 +00:00
  • 51d274961b typo zotlabs 2018-12-01 06:39:10 +00:00
  • 4b4cc04897 allow notification filtering by name or addr zotlabs 2018-12-01 03:03:14 +00:00
  • 4bf3d4d87a attached photo permissions regression zotlabs 2018-11-30 21:54:17 +00:00
  • 71cc980e96 Revision 1 doc/es-es/about/about.bb Manuel Jiménez Friaza 2018-11-26 11:43:24 +00:00
  • 58c0b81908 use flex for the default template Mario 2018-11-26 11:44:10 +00:00
  • 3b42bd43ab Do not store serialized pconfig value received via to Module/Pconfig.php M. Dent 2018-11-25 09:22:09 +00:00
  • a151532ffa update jquery-file-upload and psr-log via composer Mario 2018-11-25 09:18:26 +00:00
  • a0d1ce77dc update imagesloaded to version 4.1.4 via composer Mario 2018-11-25 09:09:26 +00:00
  • 863cae1bab Update es-es Manuel Jiménez Friaza 2018-11-24 12:23:20 +00:00
  • 4010ea814a fix mastodon tag notifications (again) zotlabs 2018-11-22 04:25:59 +00:00
  • 8e25c091f4 no mention notifications from mastodon (and pleroma) zotlabs 2018-11-22 04:03:58 +00:00
  • 2a57e00cb4 Remove local_channel() check on cache_body_hook call Max Kostikov 2018-12-02 10:07:12 +01:00
  • 52424b0f9c Merge branch 'pdf_embed_fixes' into 'dev' M. Dent 2018-12-02 05:09:45 +01:00
  • 132547a9d9 Merge branch 'sticky_aside_fixes' into 'dev' M. Dent 2018-12-02 05:07:59 +01:00
  • fdb0459288 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-01 21:43:54 +01:00
  • df84352385 make pdf preview 100% width and 300px height to match it openstreetmaps preview Mario Vavti 2018-12-01 21:37:33 +01:00
  • 8d4f6a7865 redbasic sticky aside fixes Mario Vavti 2018-12-01 21:30:18 +01:00
  • d72276df94 edit translation harukin 2018-12-01 23:15:39 +09:00
  • 450bb1c2cb edit translation harukin 2018-12-01 22:54:51 +09:00
  • 6f22e47feb typo zotlabs 2018-11-30 22:39:10 -08:00
  • c6acb6191c allow notification filtering by name or addr zotlabs 2018-11-30 19:03:14 -08:00
  • 6cade7d935 attached photo permissions regression zotlabs 2018-11-30 13:54:17 -08:00
  • c857ecab46 Create plink depending on message id format Max Kostikov 2018-11-30 19:56:49 +01:00
  • 53d9cbc69c Check local_channel() before cache call Max Kostikov 2018-11-30 11:38:47 +01:00
  • 0ee403eab3 Move cache code to addon Max Kostikov 2018-11-30 10:50:00 +01:00
  • 6f2d09eb20 Fix wrong parameter Max Kostikov 2018-11-29 23:28:45 +01:00
  • d6442ec991 Update text.php Max Kostikov 2018-11-29 23:07:39 +01:00
  • f3831fa77f Better cache settings logic Max Kostikov 2018-11-29 21:27:06 +01:00
  • 3265c2e543 Skip sslify for images if it already were cached with https enabled Max Kostikov 2018-11-29 20:36:21 +01:00
  • 1a9ea64523 Update text.php Max Kostikov 2018-11-29 19:28:54 +01:00
  • 9de650e175 Cache for viewer channel Max Kostikov 2018-11-29 19:13:43 +01:00
  • d8b5f383f5 Disable links to cached photos for non logged viewers Max Kostikov 2018-11-29 16:21:50 +01:00
  • 658c0734e2 edit translation harukin 2018-11-30 00:19:54 +09:00
  • 5c7f01140a edit translation harukin 2018-11-29 22:53:13 +09:00
  • 12767746ca edit translation harukin 2018-11-29 22:50:12 +09:00