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
Your Name
6dd84fde33
すきまテスト
2018-10-29 14:12:56 +09:00
Your Name
60eaedc67f
test
2018-10-29 14:11:09 +09:00
Your Name
ce908b31c1
再共有メッセージ修復
2018-10-29 14:05:57 +09:00
harukin
f687739cfe
Merge branch 'develop' into 'master'
...
harukin絵文字の追加
See merge request harukin/core!4
2018-10-29 13:40:10 +09:00
harukin
56d1e3792a
Merge branch 'develop' into 'japanese'
...
harukin絵文字追加
See merge request harukin/core!3
2018-10-29 13:39:02 +09:00
Your Name
ce8215ec6c
2018-10-29 13:34:25 +09:00
Your Name
db5b86dbac
テストコミット
2018-10-29 11:46:37 +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
Your Name
f928f17bb5
日本語追加
2018-10-29 10:39:11 +09:00
M.Dent
1241e778f9
Fix to set update time in pconfig on update
2018-10-28 17:30:22 -04:00
M.Dent
3ab0ef1902
Add timestamp and associated logic to pconfig
2018-10-28 17:23:31 -04:00
M.Dent
c7c35b8b5a
DB Updates to prep for pconfig timestamps.
2018-10-28 17:20:29 -04: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
Mario
df449e7bfe
Merge branch 'dev' into 'dev'
...
New strings in Spanish translation
See merge request hubzilla/core!1349
2018-10-26 08:16:16 +02:00
Mario
6326a50d20
Merge branch 'patch-20181025a' into 'dev'
...
Add entropy to queue worker - and fix requeuing of expired tasks
See merge request hubzilla/core!1350
2018-10-26 08:15:11 +02:00
M.Dent
aef212ada9
Add entropy to queue worker - and fix requeuing of expired tasks
2018-10-25 10:12:03 -04:00
Manuel Jiménez Friaza
802a7ff3a8
New strings in Spanish translation
2018-10-25 11:37:06 +02:00
M. Dent
9cedc864c2
Merge branch 'dev' into 'dev'
...
Editor contact autocomplete performance & refine stream filter and forum notification behaviour (mostly for performance)
See merge request hubzilla/core!1348
2018-10-25 03:38:05 +02:00
Mario Vavti
ee804cd6b1
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-10-24 23:08:22 +02:00
Mario Vavti
25c7e64ded
fix get on {1}
2018-10-24 23:06:32 +02: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
