Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | provide editor settings | Mario Vavti | 2018-09-21 | 3 | -8/+11 | |
| | | | ||||||
* | | | provide a return path from settings pages | Mario Vavti | 2018-09-21 | 7 | -3/+13 | |
| | | | ||||||
* | | | compare strpos() result against false | Mario Vavti | 2018-09-21 | 1 | -1/+2 | |
| | | | ||||||
* | | | add missing check | Mario Vavti | 2018-09-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'patch-5' into 'dev' | Mario | 2018-09-21 | 7 | -16/+24 | |
|\ \ \ | | | | | | | | | | | | | | | | | save admin page values See merge request hubzilla/core!1282 | |||||
| * | | | Update admin_account_edit.tpl | Max Kostikov | 2018-09-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update admin_account_edit.tpl | Max Kostikov | 2018-09-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update admin_accounts.tpl | Max Kostikov | 2018-09-21 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Update admin_channels.tpl | Max Kostikov | 2018-09-21 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Update admin_logs.tpl | Max Kostikov | 2018-09-21 | 1 | -2/+4 | |
| | | | | ||||||
| * | | | Update admin_profiles.tpl | Max Kostikov | 2018-09-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update admin_security.tpl | Max Kostikov | 2018-09-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update admin_site.tpl | Max Kostikov | 2018-09-21 | 1 | -4/+10 | |
| | | | | ||||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-21 | 7 | -15/+28 | |
|\ \ \ \ | ||||||
| * | | | | Merge branch 'patch-5' into 'dev' | Mario | 2018-09-21 | 7 | -15/+28 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Admin forms buttons design unification See merge request hubzilla/core!1281 | |||||
| | * | | | Update admin_account_edit.tpl | Max Kostikov | 2018-09-20 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Update admin_security.tpl | Max Kostikov | 2018-09-20 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Update admin_profiles.tpl | Max Kostikov | 2018-09-20 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Update admin_site.tpl | Max Kostikov | 2018-09-20 | 1 | -4/+6 | |
| | | | | | ||||||
| | * | | | Update admin_accounts.tpl | Max Kostikov | 2018-09-20 | 1 | -5/+12 | |
| | | | | | ||||||
| | * | | | Update admin_channels.tpl | Max Kostikov | 2018-09-20 | 1 | -1/+5 | |
| | | | | | ||||||
| | * | | | Update admin_logs.tpl | Max Kostikov | 2018-09-20 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-21 | 4 | -6/+8 | |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | don't double encode | zotlabs | 2018-09-20 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | remove bbcode from event hovertip | zotlabs | 2018-09-20 | 2 | -3/+4 | |
| | | | | ||||||
| * | | | Merge branch 'dev' | zotlabs | 2018-09-20 | 18 | -56/+258 | |
| |\| | | ||||||
| * | | | bookmarks fail to sync | zotlabs | 2018-09-20 | 2 | -3/+4 | |
| | | | | ||||||
* | | | | fix position of nav settings icon | Mario Vavti | 2018-09-21 | 2 | -2/+6 | |
| | | | | ||||||
* | | | | fix typo | Mario Vavti | 2018-09-21 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix can not enter text in notes widget | Mario Vavti | 2018-09-21 | 1 | -1/+2 | |
| |/ / |/| | | ||||||
* | | | remove connection filter from network settings | Mario Vavti | 2018-09-20 | 1 | -8/+0 | |
| | | | ||||||
* | | | move connection filtering setting from network to connections, provide a ↵ | Mario Vavti | 2018-09-20 | 8 | -26/+113 | |
| | | | | | | | | | | | | link to settings in the navbar if present for a module and some code optimisation | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-20 | 7 | -7/+115 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'preempt-hooks' into 'dev' | Mario | 2018-09-20 | 3 | -0/+22 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Preempt hooks See merge request hubzilla/core!1279 | |||||
| | * | | | Add structure to permit_hook | M.Dent (DM42.Net) | 2018-09-19 | 1 | -0/+7 | |
| | | | | | ||||||
| | * | | | add hook: permit_hook | M.Dent (DM42.Net) | 2018-09-19 | 3 | -7/+22 | |
| | | | | | ||||||
| * | | | | Merge branch 'hook-docs' into 'dev' | Mario | 2018-09-20 | 5 | -7/+93 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Document new hooks See merge request hubzilla/core!1278 | |||||
| | * | | | | Document new hooks | M.Dent (DM42.Net) | 2018-09-19 | 5 | -7/+93 | |
| | |/ / / | ||||||
* | / / / | deal with the ability to provide settings url in apd files in include/nav.php | Mario Vavti | 2018-09-20 | 1 | -1/+8 | |
|/ / / / | ||||||
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-20 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | fix setup | zotlabs | 2018-09-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | allow a second url in apd files for settings, hide pin and star buttons in ↵ | Mario Vavti | 2018-09-19 | 3 | -13/+22 | |
| | | | | | | | | | | | | edit mode and use strpos() instead of strstr() in some places | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-19 | 6 | -16/+41 | |
|\| | | ||||||
| * | | this was needed | zotlabs | 2018-09-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | missing autocomplete (e.g. mentions) in mod_photos comments | zotlabs | 2018-09-18 | 1 | -2/+3 | |
| | | | ||||||
| * | | Merge branch 'dev' | zotlabs | 2018-09-17 | 10 | -12/+210 | |
| |\ \ | ||||||
| | * \ | Merge branch 'patch-3' into 'dev' | Mario | 2018-09-17 | 3 | -10/+34 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Save combined view while deleting or recalling first message in thread See merge request hubzilla/core!1273 | |||||
| | | * | | Update zot.php | Max Kostikov | 2018-09-17 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Update message.php | Max Kostikov | 2018-09-17 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Update msglib.php | Max Kostikov | 2018-09-17 | 1 | -6/+6 | |
| | | | | |