Commit Graph

23666 Commits

Author SHA1 Message Date
zotlabs
51b4b6216f z6 updates to owa, linkinfo improved image detection 2018-11-04 13:56:32 -08: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
M.Dent
346a4f5933 strpos needs to test with ===0 not ==0 2018-11-01 20:23:22 -04: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
harukin
95e4dca38a 2018-11-01 21:41:46 +09:00
harukin
66e562af72 2018-11-01 14:21:12 +09:00
harukin
1f70331a12 2018-11-01 12:04:21 +09:00
harukin
38e3369566 2018-11-01 10:40:58 +09:00
harukin
7303cdbe08 2018-11-01 10:32:16 +09:00
harukin
4677e34ea6 2018-11-01 10:20:22 +09:00
harukin
a48dc3ddf6 2018-11-01 10:13:48 +09:00
harukin
c548969877 2018-11-01 09:55:26 +09:00
harukin
68150edbb9 2018-11-01 09:50:24 +09:00
harukin
8e347e1b2e 2018-11-01 09:47:43 +09:00
harukin
b26989f594 2018-11-01 09:08:25 +09:00
harukin
0a3259d77c 2018-11-01 09:07:30 +09:00
harukin
d95492c5d0 2018-11-01 09:03:09 +09:00
harukin
3555c7f0c5 2018-10-31 22:04:50 +09:00
harukin
272e2d5654 2018-10-31 21:31:56 +09:00
Mario Vavti
3dab0d365d css fix for reshared-content images and whitespace 2018-10-31 13:20:09 +01:00
harukin
3abd110d45 2018-10-31 21:19:37 +09:00