Mario
|
65be3de200
|
add files and settings for channel manager
|
2018-09-22 20:10:48 +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
|
0a5ac62b59
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-22 13:32:58 +02:00 |
|
Mario Vavti
|
1e5405ccaf
|
appification of sources
|
2018-09-22 13:32:42 +02:00 |
|
Mario
|
12d2270935
|
Merge branch 'page-meta-properties' into 'dev'
Page meta properties
See merge request hubzilla/core!1283
|
2018-09-22 10:44:51 +02:00 |
|
M. Dent
|
ed00d1b2e3
|
Page meta properties
|
2018-09-22 10:44:51 +02:00 |
|
Mario Vavti
|
2b452ffbd3
|
rge remote-tracking branch 'mike/master' into dev
|
2018-09-22 08:44:01 +02:00 |
|
zotlabs
|
3b4a23c4a1
|
doc cleanup
|
2018-09-21 17:21:47 -07:00 |
|
Mario Vavti
|
4484985c2d
|
add file
|
2018-09-21 21:37:00 +02:00 |
|
Mario Vavti
|
6f99ca1d31
|
opacity for jot settings/reset buttons
|
2018-09-21 20:59:31 +02:00 |
|
Mario Vavti
|
8efa103041
|
provide editor settings
|
2018-09-21 20:57:01 +02:00 |
|
Mario Vavti
|
9638bf2b1e
|
provide a return path from settings pages
|
2018-09-21 20:23:31 +02:00 |
|
Mario Vavti
|
6f43468724
|
compare strpos() result against false
|
2018-09-21 15:08:02 +02:00 |
|
Mario Vavti
|
18a9ebdb1e
|
add missing check
|
2018-09-21 14:07:30 +02:00 |
|
Mario
|
604142af93
|
Merge branch 'patch-5' into 'dev'
save admin page values
See merge request hubzilla/core!1282
|
2018-09-21 13:55:47 +02:00 |
|
Max Kostikov
|
2d83868ed9
|
Update admin_account_edit.tpl
|
2018-09-21 13:50:50 +02:00 |
|
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 |
|
Mario Vavti
|
437aa4082c
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-21 13:24:38 +02:00 |
|
Mario
|
0f9802a47c
|
Merge branch 'patch-5' into 'dev'
Admin forms buttons design unification
See merge request hubzilla/core!1281
|
2018-09-21 13:24:29 +02:00 |
|
Mario Vavti
|
46d6d1c329
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-09-21 12:45:32 +02:00 |
|
Mario Vavti
|
4dd1521677
|
fix position of nav settings icon
|
2018-09-21 12:16:36 +02:00 |
|
Mario Vavti
|
32fba39915
|
fix typo
|
2018-09-21 11:22:11 +02:00 |
|
Mario Vavti
|
c1697ce96b
|
fix can not enter text in notes widget
|
2018-09-21 11:15:18 +02:00 |
|
zotlabs
|
ba49e6a588
|
don't double encode
|
2018-09-20 22:46:47 -07:00 |
|
zotlabs
|
5525f082e6
|
remove bbcode from event hovertip
|
2018-09-20 22:43:01 -07: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 |
|
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 |
|