Commit Graph

7585 Commits

Author SHA1 Message Date
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
Mario a1d1d5dba7 use different settings for cal_first_day in events and cdav/calendar. This is a tradeoff. It would be better to have one setting for both but if we want to preserve the *all settings* view, this would break its functionality 2018-09-23 19:40:52 +02:00
Mario 781fdaafcd settings for events and cdav calendar 2018-09-23 19:18:05 +02:00
Mario 1f1d5b9181 provide settings for mod photo and make it slightly simpler to create new module settings 2018-09-23 17:52:32 +02:00
Mario 9e22ec267c keep the features in the central array but sort them by module name 2018-09-23 01:11:06 +02:00
Mario 45078dda82 introduce profile settings and provide a way for modules without an app to still be able to link to its settings page from the navbar 2018-09-22 19:48:17 +02:00
Mario Vavti 822bbd9ad5 another try to fix Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity 2018-09-22 14:18:37 +02:00
Mario c873f7e702 Revert "Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity"
This reverts commit 184928204a
2018-09-22 14:15:30 +02:00
Mario Vavti 9638bf2b1e provide a return path from settings pages 2018-09-21 20:23:31 +02:00
zotlabs a4d987b45a Merge branch 'dev' 2018-09-20 18:36:14 -07:00
zotlabs 3cc66b6816 bookmarks fail to sync 2018-09-20 16:07:32 -07:00
Mario Vavti 1ca558f011 move connection filtering setting from network to connections, provide a link to settings in the navbar if present for a module and some code optimisation 2018-09-20 13:22:41 +02:00
Mario Vavti a6db822a69 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-20 12:10:39 +02:00
Mario Vavti ad8226d549 deal with the ability to provide settings url in apd files in include/nav.php 2018-09-20 12:10:27 +02:00
M.Dent (DM42.Net) 3ee632514c Add structure to permit_hook 2018-09-19 22:33:25 -04:00
M.Dent (DM42.Net) 456fe71ca9 add hook: permit_hook 2018-09-19 21:54:46 -04:00
Mario c4c1b1f5a2 Merge branch 'patch-3' into 'dev'
Save combined view while deleting or recalling first message in thread

See merge request hubzilla/core!1273
2018-09-17 13:29:52 +02:00
Max Kostikov 12b9106fc7 Update zot.php 2018-09-17 13:16:04 +02:00
Max Kostikov faaffdd618 Update message.php 2018-09-17 13:15:43 +02:00
Max Kostikov 774729b221 Update msglib.php 2018-09-17 13:15:24 +02:00
Mario eefa47776b Merge branch 'trap-template-errors' into 'dev'
Trap errors in template rendering.  Output a generic error and log problem.

See merge request hubzilla/core!1274
2018-09-17 11:03:37 +02:00
Mario 0b12a7e66f Merge branch 'delete-attach-hook' into 'dev'
delete_attach hook

See merge request hubzilla/core!1275
2018-09-17 11:00:22 +02:00
zotlabs 27617efbfb Merge branch 'dev' 2018-09-16 19:05:12 -07:00
zotlabs 6ab12597f5 do not sync the channel_moved field 2018-09-16 18:59:12 -07:00
M.Dent (DM42.Net) abe35817cd Add attach_delete hook 2018-09-15 23:09:16 -04:00