Commit Graph

23681 Commits

Author SHA1 Message Date
harukin a154fedbfb edit translation 2018-11-27 14:13:47 +09:00
harukin 7c43f5b554 edit translation 2018-11-27 14:09:58 +09:00
harukin d19769115c edit translation 2018-11-27 14:03:06 +09:00
harukin 561ffce031 edit translation & add OSUSHI!.svg 2018-11-27 11:48:06 +09:00
harukin 61e2190f98 edit translation 2018-11-27 03:14:59 +09:00
harukin c56abbf7df fixed translation 2018-11-27 03:11:16 +09:00
harukin 1cd2f7e0f4 edit translation 2018-11-27 03:08:22 +09:00
harukin 516ad23aa5 fix translation miss 2018-11-27 03:05:27 +09:00
harukin 0599d27463 edit translation 2018-11-27 03:04:07 +09:00
harukin f56107c84d edit translation 2018-11-27 02:59:08 +09:00
harukin dd61824df5 edit translation 2018-11-27 02:54:15 +09:00
harukin 531b4d955c edit translation 2018-11-27 02:00:16 +09:00
harukin 87e2aa42b8 edit translation 2018-11-26 13:23:18 +09:00
harukin d9560ad124 edit translation 2018-11-26 13:19:32 +09:00
harukin b93397e415 edit translation 2018-11-26 13:14:51 +09:00
harukin 44d89c7209 edit translation 2018-11-26 12:49:12 +09:00
harukin 5bb9890660 edit translation 2018-11-26 12:33:13 +09:00
harukin f22d589c49 edit translation 2018-11-26 10:55:54 +09:00
harukin 17f873db70 edit translation /settings/display fin 2018-11-26 10:43:55 +09:00
harukin 1647c39bf2 Merge branch 'develop' into 'japanese'
merge from master/upstream

See merge request harukin/core!21
2018-11-26 10:22:21 +09:00
harukin 026d6d4a70 edit translation /settings/display 2018-11-26 03:44:07 +09:00
harukin 93113e0f00 edit translation /settings/channel fin 2018-11-26 03:29:31 +09:00
harukin 236692908a edit translation /settings/channel 2018-11-26 03:22:27 +09:00
harukin 6eea7c7e50 edit translation /settings/channel 2018-11-26 00:48:51 +09:00
harukin 31516acec2 edit translation /settings/editor/ fin 2018-11-26 00:32:55 +09:00
harukin c9728961bf edit settings/editor/ launguage 2018-11-26 00:12:46 +09:00
harukin 7bd89a9ab1 2018-11-26 00:00:41 +09:00
harukin 1aecbbece5 merge from master 2018-11-21 21:49:47 +09:00
Mario Vavti 0bba9482df fix call to undefined function 2018-11-21 13:21:29 +01:00
Mario Vavti f8a8559523 fix typo which prevented propagation of comments
(cherry picked from commit 0c94747ab1)
2018-11-20 10:09:46 +01:00
harukin a12abaac9d 規約誤植修正 2018-11-19 22:30:10 +09:00
harukin 1a1e8463cc Merge branch 'develop' into 'japanese'
merge from upsream 3.8.5 release

See merge request harukin/core!19
2018-11-19 21:44:09 +09:00
harukin f5faa053bf merge from upsream 3.8.5 release 2018-11-19 20:40:12 +09:00
Mario Vavti 1044e8e91a version 3.8.5 2018-11-19 11:12:32 +01:00
Mario Vavti ba4b1cb5af Merge branch 'master' of https://framagit.org/hubzilla/core 2018-11-19 11:10:36 +01:00
Mario Vavti 5cb4cdaa5e changelog 2018-11-19 11:10:22 +01:00
Mario 7be1d9e45a Merge branch 'patch-20181118a' into 'dev'
Patch 20181118a - fix delayed publication of posts

See merge request hubzilla/core!1398

(cherry picked from commit f34af496ec)

3787c490 Fix: delayed items propagate before publication on cloned channels
2018-11-19 10:45:01 +01:00
Mario Vavti ae97649948 update sql schemas to include update column in pconfig table 2018-11-19 10:42:18 +01:00
Mario Vavti f15e32d063 recalculate photo filesize when rotating an image 2018-11-17 09:41:26 +01:00
Mario Vavti afc75af62f strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead. 2018-11-16 22:14:11 +01:00
Mario 2778a7220f Merge branch 'master' into 'master'
delivery issue

See merge request hubzilla/core!1397
2018-11-16 10:29:45 +01:00
zotlabs 26f593afaa delivery issue 2018-11-15 13:52:25 -08:00
harukin 839a29a2a6 Merge branch 'develop' into 'japanese'
利用規約追加

See merge request harukin/core!17
2018-11-15 00:33:51 +09:00
harukin 81bc44b30f 利用規約追加 2018-11-15 00:33:51 +09:00
harukin 58083ccb0c 2018-11-15 00:28:19 +09:00
harukin 976a4da0a1 2018-11-15 00:25:55 +09:00
harukin 74c48e5906 利用規約追加 2018-11-15 00:24:20 +09:00
harukin 1d0ad72800 Merge branch 'develop' into 'japanese'
Merge Upstream to here. 3.8.4

See merge request harukin/core!14
2018-11-14 19:51:21 +09:00
harukin 23b65c8e6e Merge Upstream to here. 3.8.4 2018-11-14 19:45:51 +09:00
Mario Vavti beac45b075 more changelog 2018-11-14 11:20:39 +01:00