M.Dent
|
3ab0ef1902
|
Add timestamp and associated logic to pconfig
|
2018-10-28 17:23:31 -04: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 |
|
M.Dent
|
442d1cb48f
|
Fix template root redirection
|
2018-10-17 22:21:31 -04: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 |
|
Max Kostikov
|
ab0e2f5236
|
Update language.php
|
2018-10-14 22:28: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
|
c36773674e
|
Revert "Merge branch 'patch-11' into 'dev'"
This reverts commit e518445853, reversing
changes made to 8ce240b95c.
|
2018-10-13 17:18:42 +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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
cd5f255966
|
strings and force import_system_apps() on std_version change
|
2018-10-06 17:20:23 +02:00 |
|
Max Kostikov
|
d9efb037e3
|
Prevent links damage on foreign channel repost for cloned
|
2018-10-05 13:16:29 +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 |
|
Mario
|
009e03c3ba
|
move archives from network to channel_home
|
2018-10-03 11:47:12 +02:00 |
|
Mario Vavti
|
af3b0146a8
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-10-03 10:44:18 +02:00 |
|
Mario Vavti
|
883e2ccc91
|
move filing from conversation to network - it is only functional there.
|
2018-10-03 10:43:54 +02:00 |
|
zotlabs
|
7c1e99884c
|
do not propagate channel deletion for an already deleted channel.
|
2018-10-02 19:42:21 -07:00 |
|
M. Dent
|
29e1302f3f
|
Merge branch 'dev' into 'dev'
Fix misplaced comma with period.
See merge request hubzilla/core!1304
|
2018-10-03 03:18:43 +02:00 |
|
M.Dent
|
798f2466e4
|
Fix misplaced comma with period.
|
2018-10-02 21:14:36 -04:00 |
|
Mario Vavti
|
7dadf387e5
|
indicate locked features
|
2018-10-01 11:01:56 +02:00 |
|
M. Dent
|
ff20370d0b
|
Status editor hook
|
2018-09-29 20:22:27 +02:00 |
|
M. Dent
|
5f992ffe15
|
Remove servicelevel logic
|
2018-09-29 00:17:55 +02:00 |
|
Mario
|
27fef98a39
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-28 13:05:44 +02:00 |
|