Commit Graph

23529 Commits

Author SHA1 Message Date
harukin
1c0290df2d 2018-11-06 18:13:19 +09:00
harukin
c72b7a8830 2018-11-06 18:10:38 +09:00
harukin
a31ea72ced 2018-11-06 18:09:03 +09:00
harukin
487e415de5 2018-11-06 17:55:29 +09:00
harukin
825709870d 2018-11-06 17:42:22 +09:00
harukin
970ef5e51c 2018-11-06 17:12:20 +09:00
harukin
04aa58d920 2018-11-06 17:00:59 +09:00
harukin
cb4a1d51c1 2018-11-06 14:24:46 +09:00
harukin
352d110622 2018-11-06 12:53:15 +09:00
harukin
bd6c1b06c1 2018-11-05 22:41:39 +09:00
harukin
116915890d Merge branch 'master' into 'japanese'
Ver.3.8.3 release merge

See merge request harukin/core!11
2018-11-05 21:41:30 +09:00
harukin
d3bd55e628 commit 2018-11-05 21:33:01 +09:00
harukin
6901a37cd2 merge master 2018-11-05 21:31:21 +09:00
harukin
c52a5a2974 2018-11-05 21:25:43 +09:00
Mario Vavti
a9fd3608ea version 3.8.3 2018-11-05 10:26:59 +01:00
Mario Vavti
b25cace3ea update changelog 2018-11-05 10:25:57 +01:00
Mario Vavti
b4b3e7b9a4 update linkinfo from dev 2018-11-05 09:59:25 +01:00
Mario Vavti
4830a1559d Merge branch 'dev' 2018-11-05 09:55:23 +01:00
Mario
92ea3ef720 Merge branch 'dev' into 'dev'
more fixes for forum notifications handling: do not count likes/dislikes if…

See merge request hubzilla/core!1367
2018-11-05 09:42:07 +01:00
harukin
3eb6748578 2018-11-04 16:18:36 +09:00
Mario Vavti
de32b0bba5 more fixes for forum notifications handling: do not count likes/dislikes if likes notifications are disabled and also do not show like activities when clicking a forum notification and like notifications are disabled 2018-11-03 20:53:23 +01:00
Mario
de0fab78ed Merge branch 'dev' into 'dev'
Fixed typo at view/es-es/hstrings.php

See merge request hubzilla/core!1366
2018-11-03 20:11:14 +01:00
Manuel Jiménez Friaza
71425c3b23 Fixed typo at view/es-es/hstrings.php 2018-11-03 19:19:01 +01:00
Mario
75f7b1e261 Merge branch 'patch-3' into 'dev'
Update hmessages.po

See merge request hubzilla/core!1365
2018-11-03 13:22:34 +01:00
Mario
9af35d998f Merge branch 'patch-2' into 'dev'
Update hstrings.php

See merge request hubzilla/core!1364
2018-11-03 13:21:53 +01:00
Mario
34e3f3907a Merge branch 'patch-22' into 'dev'
More precise content encoding detection on conversion

See merge request hubzilla/core!1363
2018-11-03 13:21:22 +01:00
Max Kostikov
46b0510b99 Update Linkinfo.php 2018-11-03 10:41:31 +01:00
Max Kostikov
a7624ea48b Update Linkinfo.php 2018-11-03 00:10:05 +01:00
Max Kostikov
2f3b4a7aaf Update Linkinfo.php 2018-11-03 00:01:15 +01:00
Max Kostikov
a9bbe0b128 Update Linkinfo.php 2018-11-02 22:40:48 +01:00
Max Kostikov
0d9d0a4b70 more precise codepage detection 2018-11-02 22:37:53 +01:00
gia vec
8235d0bd50 Update hmessages.po 2018-11-02 19:41:07 +01:00
gia vec
c2e01bedc5 Update hstrings.php 2018-11-02 19:27:11 +01:00
Max Kostikov
32c4614a32 Workaround for incorrect ISO-8859-5 encoded content conversion 2018-11-02 10:52:52 +01:00
Mario
24ae6c91ea Merge branch 'patch-21' into 'dev'
Fix wrong image resize for some external images

See merge request hubzilla/core!1362
2018-11-02 10:20:18 +01:00
Max Kostikov
c6551336c8 Fix wrong image resize for some external images 2018-11-01 21:50:36 +01:00
harukin
a240e1de75 Merge branch 'develop' into 'japanese'
5000兆円欲しい!!

See merge request harukin/core!9
2018-11-01 23:03:58 +09:00
harukin
a776210aa7 Merge branch 'develop' into 'master'
5000兆円欲しい!!

See merge request harukin/core!8
2018-11-01 23:03:07 +09:00
harukin
88a6a2d1de 2018-11-01 23:01:27 +09:00
harukin
e022a7edee 2018-11-01 22:59:08 +09:00
harukin
5d912efb32 2018-11-01 22:58:08 +09:00
harukin
5243af975c 2018-11-01 22:56:50 +09:00
harukin
43486e7137 2018-11-01 22:55:18 +09:00
harukin
b2430495f5 修正 2018-11-01 22:53:44 +09:00
harukin
1b1a6e357a 修正 2018-11-01 22:50:16 +09:00
harukin
626b5f36ad 修正 2018-11-01 22:46:40 +09:00
harukin
746ceebcdc 5000兆円欲しい!! 2018-11-01 22:39:28 +09:00
harukin
2a40051475 Merge branch 'develop' into 'japanese'
archkinux絵文字の追加

See merge request harukin/core!7
2018-11-01 22:06:04 +09:00
harukin
2406574041 Merge branch 'develop' into 'master'
archlinux絵文字の追加

See merge request harukin/core!6
2018-11-01 22:04:54 +09:00
harukin
23c40b9618 2018-11-01 21:53:18 +09:00