harukin
|
352d110622
|
|
2018-11-06 12:53:15 +09:00 |
|
zotlabs
|
43a5f928ba
|
these changes needed to ensure cloning/syncing works in the future to non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch
|
2018-11-05 16:57:32 -08:00 |
|
M. Dent
|
873fa16517
|
Merge branch 'patch-23' into 'dev'
Use modern get_config() syntax
See merge request hubzilla/core!1368
|
2018-11-06 01:27:06 +01:00 |
|
Max Kostikov
|
f7ce374a28
|
Update Photo.php
|
2018-11-05 21:26:10 +01:00 |
|
Max Kostikov
|
2dd124d09e
|
Use modern get_config() syntax
|
2018-11-05 21:25:08 +01: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
|
0e9347efa5
|
Merge branch 'master' into 'develop'
Ver.3.8.3 release merge
See merge request harukin/core!10
|
2018-11-05 21:39:29 +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
|
d6523c67a6
|
Merge branch 'patch-20181028a' into 'dev'
Add timestamp to pconfig
See merge request hubzilla/core!1355
|
2018-11-05 10:40:29 +01: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
|
4320f047db
|
update changelog and bump version
|
2018-11-05 10:22:56 +01:00 |
|
Mario Vavti
|
b4b3e7b9a4
|
update linkinfo from dev
|
2018-11-05 09:59:25 +01:00 |
|
Mario Vavti
|
b6938da552
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-05 09:56:52 +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 |
|
zotlabs
|
73d2719330
|
debug zot6 discovery
|
2018-11-04 19:35:55 -08:00 |
|
zotlabs
|
af82aab3a6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-11-04 13:58:02 -08:00 |
|
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 |
|