Commit Graph

  • ffa86b25db edit translation harukin 2018-11-29 22:46:14 +09:00
  • 2763c0f40e edit translation harukin 2018-11-29 22:42:28 +09:00
  • 6aa99a903f Code cleanup Max Kostikov 2018-11-29 11:56:56 +01:00
  • d9faf6c4bb Update text.php Max Kostikov 2018-11-29 11:48:12 +01:00
  • 48cd5855fe Add photo cache support using sslify() Max Kostikov 2018-11-29 11:06:14 +01:00
  • bd0fc8a2d7 Add photo cache hooks Max Kostikov 2018-11-29 10:38:25 +01:00
  • 476bd7400d Add photo cache cleanup Max Kostikov 2018-11-29 10:37:39 +01:00
  • bd10d48338 Update database with expires field for photo Max Kostikov 2018-11-29 10:36:56 +01:00
  • bb91064416 Add expires for photo Max Kostikov 2018-11-29 10:35:56 +01:00
  • 72d2fe2fd4 Add expires for photo Max Kostikov 2018-11-29 10:35:11 +01:00
  • 92a5b9ac41 Add PHOTO_CACHE photo type Max Kostikov 2018-11-29 10:34:18 +01:00
  • cded6b1136 Merge branch 'es-es' into 'dev' M. Dent 2018-11-28 05:32:10 +01:00
  • 19f0ce7e37 Merge branch 'default2flex-conversion' into 'dev' M. Dent 2018-11-28 04:03:39 +01:00
  • a88a515fa0 Merge branch 'composer-updates' into 'dev' M. Dent 2018-11-28 03:55:13 +01:00
  • a4b2eac0f0 Merge branch 'update-imagesloaded' into 'dev' M. Dent 2018-11-28 03:52:53 +01:00
  • 0bd38290e6 Merge branch 'pg-fixes' into 'dev' M. Dent 2018-11-28 03:49:22 +01:00
  • 19e4f3c2f0 prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible zotlabs 2018-11-27 11:53:02 -08:00
  • e6edac1589 edit translation harukin 2018-11-28 00:29:24 +09:00
  • 781d0c0fe0 edit translation harukin 2018-11-27 23:26:03 +09:00
  • b48cb47f41 edit translation harukin 2018-11-27 19:38:00 +09:00
  • 1ece7caa57 edit translation harukin 2018-11-27 19:35:54 +09:00
  • 0c1a3b1a61 edit translation harukin 2018-11-27 19:10:07 +09:00
  • 2b5d4ef346 edit translation harukin 2018-11-27 19:07:33 +09:00
  • 2dbd990017 edit translate harukin 2018-11-27 18:59:50 +09:00
  • 34961b39fe edit translation harukin 2018-11-27 18:53:26 +09:00
  • 088a54dacb edit translation harukin 2018-11-27 18:47:25 +09:00
  • bc9d4a7643 edit translation harukin 2018-11-27 18:32:55 +09:00
  • e0ee14d5b0 edit translation harukin 2018-11-27 16:19:46 +09:00
  • e88db3d609 edit translation harukin 2018-11-27 15:45:10 +09:00
  • f7d3550122 edit translation harukin 2018-11-27 15:35:48 +09:00
  • 896681b671 edit translation harukin 2018-11-27 14:47:19 +09:00
  • fbdbd440d2 edit translation harukin 2018-11-27 14:40:32 +09:00
  • c0af854cb6 fixed translation harukin 2018-11-27 14:37:10 +09:00
  • 92889397e6 edit translation harukin 2018-11-27 14:29:43 +09:00
  • 7c10b53209 えぢ らんぁちおん harukin 2018-11-27 14:19:23 +09:00
  • a154fedbfb edit translation harukin 2018-11-27 14:13:47 +09:00
  • 7c43f5b554 edit translation harukin 2018-11-27 14:09:58 +09:00
  • d19769115c edit translation harukin 2018-11-27 14:03:06 +09:00
  • 561ffce031 edit translation & add OSUSHI!.svg harukin 2018-11-27 11:48:06 +09:00
  • 61e2190f98 edit translation harukin 2018-11-27 03:14:59 +09:00
  • c56abbf7df fixed translation harukin 2018-11-27 03:11:16 +09:00
  • 1cd2f7e0f4 edit translation harukin 2018-11-27 03:08:22 +09:00
  • 516ad23aa5 fix translation miss harukin 2018-11-27 03:05:27 +09:00
  • 0599d27463 edit translation harukin 2018-11-27 03:04:07 +09:00
  • f56107c84d edit translation harukin 2018-11-27 02:59:08 +09:00
  • dd61824df5 edit translation harukin 2018-11-27 02:54:15 +09:00
  • 531b4d955c edit translation harukin 2018-11-27 02:00:16 +09:00
  • 8bede7b81f Merge branch 'cherry-pick-5ac08ec3' into 'es-es' Manuel Jiménez Friaza 2018-11-26 12:59:03 +01:00
  • 37d563c30e Revision 1 doc/es-es/about/about.bb Manuel Jiménez Friaza 2018-11-26 11:43:24 +00:00
  • 3775be4ce9 use flex for the default template Mario 2018-11-26 12:44:10 +01:00
  • 5ac08ec3aa Revision 1 doc/es-es/about/about.bb Manuel Jiménez Friaza 2018-11-26 12:43:24 +01:00
  • 87e2aa42b8 edit translation harukin 2018-11-26 13:23:18 +09:00
  • d9560ad124 edit translation harukin 2018-11-26 13:19:32 +09:00
  • b93397e415 edit translation harukin 2018-11-26 13:14:51 +09:00
  • 44d89c7209 edit translation harukin 2018-11-26 12:49:12 +09:00
  • 5bb9890660 edit translation harukin 2018-11-26 12:33:13 +09:00
  • f22d589c49 edit translation harukin 2018-11-26 10:55:54 +09:00
  • 17f873db70 edit translation /settings/display fin harukin 2018-11-26 10:43:55 +09:00
  • 1647c39bf2 Merge branch 'develop' into 'japanese' harukin 2018-11-26 10:22:21 +09:00
  • 026d6d4a70 edit translation /settings/display harukin 2018-11-26 03:44:07 +09:00
  • 93113e0f00 edit translation /settings/channel fin harukin 2018-11-26 03:29:31 +09:00
  • 236692908a edit translation /settings/channel harukin 2018-11-26 03:22:27 +09:00
  • 6eea7c7e50 edit translation /settings/channel harukin 2018-11-26 00:48:51 +09:00
  • 31516acec2 edit translation /settings/editor/ fin harukin 2018-11-26 00:32:55 +09:00
  • c9728961bf edit settings/editor/ launguage harukin 2018-11-26 00:12:46 +09:00
  • 7bd89a9ab1 harukin 2018-11-26 00:00:41 +09:00
  • 39b553529d add manifest.json harukin 2018-11-25 23:36:59 +09:00
  • e5883dd605 Merge branch 'patch-20181120a' into 'dev' Mario 2018-11-25 10:22:09 +01:00
  • 6b02c664fb Do not store serialized pconfig value received via to Module/Pconfig.php M. Dent 2018-11-25 10:22:09 +01:00
  • c7ae3fdc9a update jquery-file-upload and psr-log via composer Mario 2018-11-25 10:18:26 +01:00
  • c667572d3e update imagesloaded to version 4.1.4 via composer Mario 2018-11-25 10:09:26 +01:00
  • 9bbd6ff67d Merge branch 'es-es' into 'dev' Mario 2018-11-24 21:16:59 +01:00
  • ca98a566ee Update es-es Manuel Jiménez Friaza 2018-11-24 13:23:20 +01:00
  • f865d6e5da Resolved merge conflicts Manuel Jiménez Friaza 2018-11-24 13:01:01 +01:00
  • bc9f2922e0 Merge remote-tracking branch 'mike/master' into dev Mario 2018-11-23 22:04:51 +01:00
  • c5a9b00eae Organization actor type was missing zotlabs 2018-11-23 12:25:05 -08:00
  • f408ff982c Merge remote-tracking branch 'mike/master' into dev Mario 2018-11-23 15:42:40 +01:00
  • 9a8d1200ec use uuid in file storage zotlabs 2018-11-22 18:39:38 -08:00
  • 16c7aa2813 fix db upgrade 1228 for postgres Mario 2018-11-22 12:52:08 +01:00
  • 85f52d2aed Merge remote-tracking branch 'mike/master' into dev Mario 2018-11-22 10:17:18 +01:00
  • 8e71324514 fix mastodon tag notifications (again) zotlabs 2018-11-21 20:25:59 -08:00
  • ea235c0c67 no mention notifications from mastodon (and pleroma) zotlabs 2018-11-21 20:03:58 -08:00
  • ea995d017b Merge branch 'develop' into 'master' harukin 2018-11-21 21:54:12 +09:00
  • 1aecbbece5 merge from master harukin 2018-11-21 21:49:47 +09:00
  • e30be643c9 fix call to undefined function Mario Vavti 2018-11-21 12:21:29 +00:00
  • 0bba9482df fix call to undefined function Mario Vavti 2018-11-21 13:21:29 +01:00
  • 07fd2dbc99 Merge branch 'dev' into 'dev' Mario 2018-11-20 11:08:27 +01:00
  • f8a8559523 fix typo which prevented propagation of comments Mario Vavti 2018-11-18 10:02:01 +00:00
  • 6481c9dca1 use this form instead zotlabs 2018-11-19 15:20:28 -08:00
  • 7aaa1973f4 push recent changes zotlabs 2018-11-19 15:04:08 -08:00
  • a12abaac9d 規約誤植修正 harukin 2018-11-19 22:30:10 +09:00
  • 4dea1b5a0d Replace hmessages.po Max Kostikov 2018-11-19 13:52:31 +01:00
  • da44ab0529 Replace hstrings.php Max Kostikov 2018-11-19 13:51:54 +01:00
  • 1a1e8463cc Merge branch 'develop' into 'japanese' harukin 2018-11-19 21:44:09 +09:00
  • 343fccd7fd Merge branch 'develop' into 'master' harukin 2018-11-19 21:40:07 +09:00
  • 577102c4ec merge from upsream 3.8.5 release harukin 2018-11-19 21:40:07 +09:00
  • 73b836c73d Revert "Fix return on wrong sotred in Content-Length size for full size photos" Mario 2018-11-19 13:11:18 +01:00
  • af0c2f59cc Revert "Add filesize for streaming content" Mario 2018-11-19 13:11:04 +01:00
  • f5faa053bf merge from upsream 3.8.5 release harukin 2018-11-19 20:40:12 +09:00
  • 1044e8e91a version 3.8.5 Mario Vavti 2018-11-19 11:12:32 +01:00