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 |
|
Mario
|
41108fc4d3
|
nav_channel_select should be off by default
|
2018-09-28 11:46:17 +02:00 |
|
Mario Vavti
|
20285d076b
|
settings for channel home
|
2018-09-28 11:29:05 +02:00 |
|
Max Kostikov
|
65785ead69
|
Update zot.php
|
2018-09-28 01:05:03 +02:00 |
|
Max Kostikov
|
2836bce8fe
|
Update security.php
|
2018-09-28 00:51:21 +02:00 |
|
Max Kostikov
|
51c0045be4
|
Update zot.php
|
2018-09-28 00:38:36 +02:00 |
|
Max Kostikov
|
abfbfd9e9b
|
Update group.php
|
2018-09-28 00:33:52 +02:00 |
|
Max Kostikov
|
208d38207e
|
Update acl_selectors.php
|
2018-09-27 23:59:45 +02:00 |
|
Max Kostikov
|
ffe80c66d7
|
Update api_zot.php
|
2018-09-27 23:58:49 +02:00 |
|
Max Kostikov
|
bfa672f42c
|
Update channel.php
|
2018-09-27 23:56:54 +02:00 |
|
Max Kostikov
|
9f89f3190a
|
Update connections.php
|
2018-09-27 23:55:20 +02:00 |
|
Max Kostikov
|
71931b423c
|
Update items.php
|
2018-09-27 23:53:51 +02:00 |
|
Max Kostikov
|
b54aabc958
|
Update security.php
|
2018-09-27 23:52:46 +02:00 |
|
Max Kostikov
|
a45fe72eb9
|
Update text.php
|
2018-09-27 23:50:26 +02:00 |
|
Max Kostikov
|
62d64631b5
|
Update xchan.php
|
2018-09-27 23:49:41 +02:00 |
|
Mario Vavti
|
6b23c3e179
|
implement conversation tools (settings/conversation), remove additional features from the settings menu and get rid of skill levels
|
2018-09-27 14:56:47 +02:00 |
|
Mario Vavti
|
e3c04b1fd0
|
guest access app
|
2018-09-26 22:24:36 +02:00 |
|
Mario Vavti
|
a7948d7bfe
|
permcats app
|
2018-09-26 22:02:50 +02:00 |
|
Mario Vavti
|
505782f224
|
remove oauth from features
|
2018-09-26 16:35:05 +02:00 |
|
Mario Vavti
|
9948bb3f2a
|
appification of privacy groups
|
2018-09-25 12:59:53 +02:00 |
|
Mario Vavti
|
65423b1768
|
get rid of general features
|
2018-09-25 12:02:48 +02:00 |
|
Mario Vavti
|
39866b7463
|
move start_menu switch to settings/display for now
|
2018-09-25 11:37:22 +02:00 |
|
Mario Vavti
|
4c58a5cef2
|
premium channel app
|
2018-09-25 10:06:24 +02:00 |
|
Mario Vavti
|
c3aa15cc16
|
appification of notes
|
2018-09-24 11:46:18 +02:00 |
|
Mario Vavti
|
b45bd901e0
|
move categories from tools to editor settings
|
2018-09-24 10:13:56 +02:00 |
|
Mario
|
7cadc30914
|
settings for directory and set App::$profile_uid in directory if local_channel()
|
2018-09-24 09:33:52 +02:00 |
|