Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ | |||||
| * | 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 |
| |\ \ | | |/ | |/| | |||||
| * | | 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 |
| |\ \ | |||||
| * | | | remove superfluous comma | Mario Vavti | 2018-09-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove unused variable | Mario Vavti | 2018-09-17 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-17 | 1 | -4/+4 |
| |\ \ \ | |||||
* | | | | | bookmarks fail to sync | zotlabs | 2018-09-20 | 2 | -3/+4 |
| |_|_|/ |/| | | | |||||
* | | | | fix setup | zotlabs | 2018-09-19 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | 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 |
| | | | | |||||
| | * | | Update msglib.php | Max Kostikov | 2018-09-16 | 1 | -10/+6 |
| | | | | |||||
| | * | | use common msg_drop function | Max Kostikov | 2018-09-15 | 1 | -25/+3 |
| | | | | |||||
| | * | | Use common msg_drop function | Max Kostikov | 2018-09-15 | 1 | -25/+3 |
| | | | | |||||
| | * | | formatting | Max Kostikov | 2018-09-15 | 1 | -24/+21 |
| | | | | |||||
| | * | | Create msglib.php | Max Kostikov | 2018-09-15 | 1 | -0/+35 |
| | | | | |||||
| | * | | Add new file | Max Kostikov | 2018-09-15 | 1 | -0/+0 |
| | | | | |||||
| | * | | unification with zot.php code for future reuse | Max Kostikov | 2018-09-15 | 1 | -2/+2 |
| | | | | |||||
| | * | | formatting | Max Kostikov | 2018-09-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Save combined view on calling first message in thread | Max Kostikov | 2018-09-15 | 1 | -0/+20 |
| | | | | |||||
| | * | | less data in select | Max Kostikov | 2018-09-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | formatting | Max Kostikov | 2018-09-14 | 1 | -3/+3 |
| | | | | |||||
| | * | | Save combined view while deleting first message in thread | Max Kostikov | 2018-09-14 | 1 | -0/+20 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-17 | 3 | -1/+15 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'trap-template-errors' into 'dev' | Mario | 2018-09-17 | 1 | -1/+7 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Trap errors in template rendering. Output a generic error and log problem. See merge request hubzilla/core!1274 | ||||
| | | * | | | Catch errors in template rendering. Output a generic error and log problem. | M.Dent | 2018-09-14 | 1 | -1/+7 |
| | | | | | | |||||
| | * | | | | Merge branch 'delete-attach-hook' into 'dev' | Mario | 2018-09-17 | 1 | -0/+5 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete_attach hook See merge request hubzilla/core!1275 | ||||
| | | * | | | | Add attach_delete hook | M.Dent (DM42.Net) | 2018-09-15 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'app-list-hook' into 'dev' | Mario | 2018-09-17 | 1 | -0/+3 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hook to allow addons to filter the list returned by app_list See merge request hubzilla/core!1276 | ||||
| | | * | | | | | Add hook to allow addons to filter the list returned by app_list | M.Dent | 2018-09-16 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | seperate settings for mod network | Mario Vavti | 2018-09-17 | 2 | -0/+143 |
| |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-17 | 8 | -13/+98 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | prepare submodule to interact with route | Mario Vavti | 2018-09-17 | 2 | -1/+18 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | fix listeners table create and expire federation had a syntax error | zotlabs | 2018-09-17 | 2 | -5/+5 |
| |_|_|_|_|/ |/| | | | | |