Commit Graph
22098 Commits
Author SHA1 Message Date
Max Kostikov 73195a0215 Update admin_account_edit.tpl 2018-09-21 13:48:44 +02:00
Max Kostikov 13d05549f8 Update admin_accounts.tpl 2018-09-21 13:48:40 +02:00
Max Kostikov 0143bc734c Update admin_channels.tpl 2018-09-21 13:48:35 +02:00
Max Kostikov ff860a3310 Update admin_logs.tpl 2018-09-21 13:48:27 +02:00
Max Kostikov ed0044aeab Update admin_profiles.tpl 2018-09-21 13:48:22 +02:00
Max Kostikov 1a6d290d71 Update admin_security.tpl 2018-09-21 13:48:12 +02:00
Max Kostikov dbb7245e22 Update admin_site.tpl 2018-09-21 13:48:07 +02:00
Max Kostikov 21ff570c4d Update admin_account_edit.tpl 2018-09-20 23:40:09 +02:00
Max Kostikov f2e4cf3a92 Update admin_security.tpl 2018-09-20 23:39:46 +02:00
Max Kostikov 7123de66f9 Update admin_profiles.tpl 2018-09-20 23:39:18 +02:00
Max Kostikov e4fe202fc6 Update admin_site.tpl 2018-09-20 23:38:48 +02:00
Max Kostikov bde6caf167 Update admin_accounts.tpl 2018-09-20 23:38:19 +02:00
Max Kostikov 96f45b5fbe Update admin_channels.tpl 2018-09-20 23:36:35 +02:00
Max Kostikov 4352afeeb0 Update admin_logs.tpl 2018-09-20 23:32:13 +02:00
Mario Vavti 369f34b2d1 remove connection filter from network settings 2018-09-20 13:25:47 +02: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
Mario 1b27327057 Merge branch 'preempt-hooks' into 'dev'
Preempt hooks

See merge request hubzilla/core!1279
2018-09-20 12:08:45 +02:00
Mario 3d713cee62 Merge branch 'hook-docs' into 'dev'
Document new hooks

See merge request hubzilla/core!1278
2018-09-20 12:07:47 +02:00
Mario Vavti afd4da8f11 Merge remote-tracking branch 'mike/master' into dev 2018-09-20 11:16:14 +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
M.Dent (DM42.Net) f2c59b3881 Document new hooks 2018-09-19 21:18:06 -04:00
zotlabs 2c1560e027 fix setup 2018-09-19 17:56:23 -07:00
Mario Vavti 34fec995f7 allow a second url in apd files for settings, hide pin and star buttons in edit mode and use strpos() instead of strstr() in some places 2018-09-19 15:00:06 +02:00
Mario Vavti ec7cbe272a Merge remote-tracking branch 'mike/master' into dev 2018-09-19 11:23:38 +02:00
zotlabs 98bc1ed600 this was needed 2018-09-18 23:18:59 -07:00
zotlabs 7756773683 missing autocomplete (e.g. mentions) in mod_photos comments 2018-09-18 19:52:10 -07:00
zotlabs dfdf11d461 Merge branch 'dev' 2018-09-17 19:38:40 -07:00
zotlabs cc5ef57843 fix listeners table create and expire federation had a syntax error 2018-09-17 18:40:49 -07:00
Mario Vavti 71c599f50e remove superfluous comma 2018-09-17 22:16:42 +02:00
Mario Vavti a1f3a5d9b6 remove unused variable 2018-09-17 22:16:10 +02:00
Mario Vavti a9e89d2fcc Merge remote-tracking branch 'mike/master' into dev 2018-09-17 22:07:50 +02:00
zotlabs fdc89d1b89 pdo install check requires namespacing 2018-09-17 13:03:17 -07: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 Vavti 1455fa6bc3 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-17 11:36:25 +02:00
Mario Vavti a9853e6033 seperate settings for mod network 2018-09-17 11:36:11 +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
Mario 3019d8341d Merge branch 'app-list-hook' into 'dev'
Add hook to allow addons to filter the list returned by app_list

See merge request hubzilla/core!1276
2018-09-17 10:55:47 +02:00
Mario Vavti dcacfc1124 Merge remote-tracking branch 'mike/master' into dev 2018-09-17 10:31:13 +02:00
Mario Vavti 2f6cb764a4 prepare submodule to interact with route 2018-09-17 10:30:47 +02:00
M.Dent a0cf2b53e0 Add hook to allow addons to filter the list returned by app_list 2018-09-16 23:01:17 -04:00
zotlabs 593a5072d9 Some improvements to setup checks: image library and pdo support 2018-09-16 20:00:20 -07: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