harukin
d3bd55e628
commit
2018-11-05 21:33:01 +09:00
Max Kostikov
c6551336c8
Fix wrong image resize for some external images
2018-11-01 21:50:36 +01: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
23c40b9618
2018-11-01 21:53:18 +09:00
Mario Vavti
0252bac4ba
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-10-31 09:39:10 +01:00
Mario
b468069875
Merge branch 'patch-20' into 'dev'
...
Beautiful embedding for Hubzilla links
See merge request hubzilla/core!1360
2018-10-31 09:36:09 +01:00
zotlabs
70c55da1df
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-10-30 18:11:49 -07:00
zotlabs
9594105e57
typo
2018-10-30 17:21:39 -07:00
zotlabs
675343f575
issue syncing the channel_primary setting which shows up as a wrong count on the admin summary page
2018-10-30 17:18:15 -07:00
Mario Vavti
b4bac88c39
fix markdown tests
2018-10-30 22:37:41 +01:00
Mario Vavti
c622ba84b9
really fix html2markdown() - when using environment, we must set the defaults
2018-10-30 22:16:37 +01:00
Max Kostikov
339f95c647
Update oembed.php
2018-10-30 16:49:48 +01:00
Max Kostikov
ec67e0ab22
Beautiful embedding for Hubzilla links
2018-10-30 15:38:19 +01:00
Mario Vavti
0b371c8103
fix html2markdown() and re-enable previously failing tests
2018-10-30 13:55:08 +01:00
Your Name
d12c6ccb72
2018-10-29 21:44:52 +09:00
Mario Vavti
e1c3a19420
merge include/zot.php from dev
2018-10-29 10:08:12 +01:00
Mario Vavti
cc586685e6
merge include/nav.php from dev
2018-10-29 10:07:54 +01:00
Mario Vavti
31883f603c
merge include/import.php from dev
2018-10-29 10:07:15 +01:00
Mario Vavti
f377c81c8a
merge include/connections.php from dev
2018-10-29 10:06:44 +01:00
Mario Vavti
e1df69dfcb
Merge branch 'dev'
2018-10-29 07:43:40 +01:00
Your Name
ecab83264c
harukinの表示サイズ変更
2018-10-29 11:26:30 +09:00
Your Name
ff1db9a055
harukin絵文字追加テスト
2018-10-29 10:45:45 +09:00
zotlabs
ae4aeb4b1e
delivery chain linkage messed up if original post was edited
2018-10-26 13:00:26 -07:00
Mario Vavti
5c4fbbebe1
refine stream filter and forum notification behaviour (mostly for performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath.
2018-10-24 20:58:25 +02:00
Mario Vavti
fa9e9510e5
Merge branch '3.8RC'
2018-10-19 11:18:28 +02:00
Mario
c440b758a3
Merge branch 'dev' into 'dev'
...
Fix template root redirection
See merge request hubzilla/core!1343
(cherry picked from commit e9471124c0442d1cb4
2018-10-18 09:12:38 +02:00
M.Dent
442d1cb48f
Fix template root redirection
2018-10-17 22:21:31 -04:00
Mario
7268426248
Merge branch 'dev' into 'dev'
...
Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci.
See merge request hubzilla/core!1332
(cherry picked from commit c39de966dfb77acb3e22275f300db047e5
2018-10-15 10:00:06 +02:00
Mario
c39de966df
Merge branch 'dev' into 'dev'
...
Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci.
See merge request hubzilla/core!1332
2018-10-15 09:59:52 +02:00
Mario
eb133ef9a7
Merge branch 'patch-16' into 'dev'
...
JS plurals displaying code cleanup
See merge request hubzilla/core!1338
(cherry picked from commit 721461dd3eb7280a44ab0e2f52f9c3b807ce52c27a
2018-10-15 09:59:25 +02:00
Max Kostikov
ab0e2f5236
Update language.php
2018-10-14 22:28:14 +02:00
Mario
eaee27c9e4
Merge branch 'patch-14' into 'dev'
...
Add date/time plurals translation in JavaScript
See merge request hubzilla/core!1336
(cherry picked from commit a2575059e25c0d3187729d0d53f68674b33ac4337ae96e3dc654bdf59d
2018-10-13 20:17:14 +02:00
Max Kostikov
54bdf59dde
Update js_strings.php
2018-10-13 19:56:07 +02:00
Max Kostikov
729d0d5368
Update language.php
2018-10-13 19:50:09 +02:00
Max Kostikov
5c0d31873a
Add date/time plurals translation in JavaScript
2018-10-13 19:48:45 +02:00
Mario Vavti
2c961328f1
Merge branch 'dev' into 3.8RC
2018-10-13 17:21:12 +02:00
Mario Vavti
c36773674e
Revert "Merge branch 'patch-11' into 'dev'"
...
This reverts commit e5184458538ce240b95c
2018-10-13 17:18:42 +02:00
Mario Vavti
f0cdbd0f52
Merge branch 'dev' into 3.8RC
2018-10-13 14:11:08 +02:00
ZotSocial Admin
321b2b9b49
Fix order of assignment and get template file before return
...
(cherry picked from commit 8ebcc4439b
2018-10-13 14:01:43 +02:00
Mario
fb3dd5eee6
Merge branch 'dev' into 'dev'
...
Fix order of assignment and get template file before return
See merge request hubzilla/core!1329
2018-10-13 14:01:01 +02:00
git-marijus
0db047e572
fix phpunit error with html2markdown test and temporary disable failing markdown test in connection with **bold** and _italic_ (it is not clear why they fail and the code appears to work as expected)
2018-10-13 13:39:22 +02:00
Max Kostikov
6ae9ef571e
Update language.php
2018-10-13 02:14:19 +02:00
