harukin
6901a37cd2
merge master
2018-11-05 21:31:21 +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
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
0a3259d77c
2018-11-01 09:07:30 +09:00
Your Name
d12c6ccb72
2018-10-29 21:44:52 +09:00
Your Name
2cf2171ac2
test
2018-10-29 21:25:16 +09:00
Mario Vavti
c8dd516d6c
Merge branch 'dev'
2018-10-29 11:02:51 +01:00
Mario Vavti
0f19627407
changelog
2018-10-29 10:59:54 +01:00
Mario Vavti
3eb71fe7b5
merge Zotlabs/Access/PermissionLimits.php from dev
2018-10-29 10:21:10 +01:00
Mario Vavti
0035584d91
merge view/fr/hmessages.po from dev
2018-10-29 10:20:36 +01:00
Mario Vavti
8cbd2e3e9e
merge view/ru/hstrings.php from dev
2018-10-29 10:19:55 +01:00
Mario Vavti
b0f5c7f36f
merge view/ru/hmessages.po from dev
2018-10-29 10:19:31 +01:00
Mario Vavti
412eb0a90b
merge view/it/hstrings.php from dev
2018-10-29 10:18:21 +01:00
Mario Vavti
f8e816629d
merge view/it/hmessages.po from dev
2018-10-29 10:17:54 +01:00
Mario Vavti
3d0138569d
merge view/es-es/hstrings.php from dev
2018-10-29 10:17:04 +01:00
Mario Vavti
7bb7d736a2
merge view/es-es/hmessages.po from dev
2018-10-29 10:16:29 +01:00
Mario Vavti
7910f39613
merge util/zotsh/zotsh.py from dev
2018-10-29 10:16:01 +01:00
Mario Vavti
bf6ef2a588
merge util/update_theme_repo from dev
2018-10-29 10:15:18 +01:00
Mario Vavti
a11d89daa3
merge util/update_autoloader from dev
2018-10-29 10:14:43 +01:00
Mario Vavti
b8a4a6b959
merge util/hmessages.po from dev
2018-10-29 10:10:03 +01:00
Mario Vavti
dd6045d9f8
merge install/schema_postgres.sql from dev
2018-10-29 10:08:37 +01: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
32384eaf07
merge Zotlabs/Widget/Wiki_pages.php from dev
2018-10-29 10:06:01 +01:00
Mario Vavti
7c2efa697c
merge Zotlabs/Module/Photo.php from dev
2018-10-29 10:04:34 +01:00
Mario Vavti
e1df69dfcb
Merge branch 'dev'
2018-10-29 07:43:40 +01:00
harukin
f687739cfe
Merge branch 'develop' into 'master'
...
harukin絵文字の追加
See merge request harukin/core!4
2018-10-29 13:40:10 +09:00
Your Name
ecab83264c
harukinの表示サイズ変更
2018-10-29 11:26:30 +09:00
Your Name
81194b2caa
画像サイズ変更
2018-10-29 11:21:56 +09:00
Your Name
ce185c14d3
画像のディレクトリ情報情報修正
2018-10-29 11:19:31 +09:00
Your Name
ff1db9a055
harukin絵文字追加テスト
2018-10-29 10:45:45 +09:00
M. Dent
3d9b1fd343
Merge branch 'dev' into 'dev'
...
fix issues with forum handling in mod network and ping. also some code cleanup.
See merge request hubzilla/core!1354
2018-10-28 03:22:22 +01:00
Mario Vavti
96bed3a623
fix issues with forum handling in mod network and ping. also some code cleanup.
2018-10-27 22:34:18 +02:00
Mario Vavti
e72b0edce2
Merge remote-tracking branch 'mike/master' into dev
2018-10-27 13:50:30 +02:00
zotlabs
ae4aeb4b1e
delivery chain linkage messed up if original post was edited
2018-10-26 13:00:26 -07:00
M. Dent
302abc2a60
Merge branch 'dev' into 'dev'
...
notifications: fix unseen forum count
See merge request hubzilla/core!1351
2018-10-26 17:10:10 +02:00
Mario Vavti
2b3cbc638b
notifications: fix unseen forum count
2018-10-26 09:53:56 +02:00
Mario
3de055bf65
Merge branch 'dev' into 'dev'
...
New strings in Spanish translation
See merge request hubzilla/core!1349
(cherry picked from commit df449e7bfe802a7ff3
2018-10-26 08:16:54 +02:00
harukin
Your Name
Mario Vavti
M. Dent
zotlabs