Your Name
ecab83264c
harukinの表示サイズ変更
2018-10-29 11:26:30 +09:00
Your Name
ff1db9a055
harukin絵文字追加テスト
2018-10-29 10:45:45 +09: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
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
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
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
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
Max Kostikov
6ae9ef571e
Update language.php
2018-10-13 02:14:19 +02:00
Max Kostikov
8e5189464e
Update language.php
2018-10-13 01:36:24 +02:00
Max Kostikov
0de713ff36
Update language.php
2018-10-13 01:08:06 +02:00
Max Kostikov
137bee9d27
Update language.php
2018-10-13 00:40:06 +02:00
Max Kostikov
3641ab8c7d
Update language.php
2018-10-13 00:28:12 +02:00
Max Kostikov
16b6b76507
Update language.php
2018-10-13 00:25:57 +02:00
Max Kostikov
5cd9540d5f
Update language.php
2018-10-13 00:24:04 +02:00
Max Kostikov
ae7873260e
Update language.php
2018-10-13 00:20:23 +02:00
Max Kostikov
3e19c4ddae
Update language.php
2018-10-13 00:12:17 +02:00
Max Kostikov
8cb05a91ab
Update language.php
2018-10-12 23:45:52 +02:00
Max Kostikov
5f2c3f607e
Add plurals translation at browser side (JS)
2018-10-12 23:43:38 +02:00
ZotSocial Admin
8ebcc4439b
Fix order of assignment and get template file before return
2018-10-12 15:20:57 -04:00
zotlabs
f783454774
verify some edge case http signatures
...
(cherry picked from commit c6bfd5e7be
2018-10-12 10:56:28 +02:00
zotlabs
c6bfd5e7be
verify some edge case http signatures
2018-10-11 21:28:47 -07:00
zotlabs
2cb52f8875
Merge branch 'dev'
2018-10-08 20:58:16 -07:00
zotlabs
2c797807cd
whitespace
2018-10-08 20:56:20 -07:00
Max Kostikov
2ba95758eb
Prevent links damage on foreign channel repost for cloned
...
(cherry picked from commit d9efb037e3
2018-10-08 11:20:34 +02:00
Mario
13c08f9660
Merge branch 'patch-2' into 'dev'
...
Prevent links damage on foreign channel repost for cloned
See merge request hubzilla/core!1307
2018-10-08 11:18:28 +02:00
M.Dent
8ca321df7c
Add missing else clause
...
(cherry picked from commit 259db3778c
2018-10-07 08:43:58 +02:00
zotlabs
ed97800c80
use hubloc_store_lowlevel to ensure all hubloc columns are initialised
...
(cherry picked from commit 52be5c1660
2018-10-07 08:43:28 +02:00
Mario Vavti
5acd166d18
Merge remote-tracking branch 'mike/master' into dev
2018-10-07 08:39:29 +02:00
M. Dent
3efeeecace
Merge branch 'dev' into 'dev'
...
Add missing else clause
See merge request hubzilla/core!1317
2018-10-07 05:05:27 +02:00
M.Dent
259db3778c
Add missing else clause
2018-10-06 23:02:22 -04:00
zotlabs
52be5c1660
use hubloc_store_lowlevel to ensure all hubloc columns are initialised
2018-10-06 14:47:40 -07:00
Mario Vavti
9bfa5c82d1
move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section.
...
(cherry picked from commit 66cf085272
2018-10-06 20:34:57 +02:00
Mario Vavti
66cf085272
move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section.
2018-10-06 20:29:32 +02:00
Mario Vavti
a38ded702f
strings and force import_system_apps() on std_version change
...
(cherry picked from commit cd5f255966
2018-10-06 17:21:49 +02:00
Mario Vavti
cd5f255966
strings and force import_system_apps() on std_version change
2018-10-06 17:20:23 +02:00
Mario Vavti
5aa0304149
version RC1
2018-10-06 16:43:28 +02:00
Max Kostikov
d9efb037e3
Prevent links damage on foreign channel repost for cloned
2018-10-05 13:16:29 +02:00
Mario Vavti
c403c9aece
Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RC
2018-10-05 12:10:15 +02:00
Mario Vavti
df5115e7b8
force major version system apps import for 3.8RC - remove this at a later point
2018-10-05 12:09:54 +02:00
zotlabs
22fbb512d5
do not propagate channel deletion for an already deleted channel.
...
(cherry picked from commit 7c1e99884c
2018-10-05 11:45:09 +02:00
Mario Vavti
69659e9bd5
Merge remote-tracking branch 'mike/master' into dev
2018-10-05 11:40:50 +02:00
zotlabs
3a0a611f15
Merge branch 'dev'
2018-10-04 19:20:10 -07:00
Mario Vavti
d4af745fc8
move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided
2018-10-04 21:38:39 +02:00
Mario Vavti
6e03104e3e
move *_list_mode to features
2018-10-04 20:48:22 +02:00
Mario
5e7c9b9d4a
jot: show settings icon only to local profile owner
2018-10-03 15:21:20 +02:00
