aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update admin_channels.tplMax Kostikov2018-09-201-1/+5
|
* Update admin_logs.tplMax Kostikov2018-09-201-1/+1
|
* remove connection filter from network settingsMario Vavti2018-09-201-8/+0
|
* move connection filtering setting from network to connections, provide a ↵Mario Vavti2018-09-208-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 devMario Vavti2018-09-207-7/+115
|\
| * Merge branch 'preempt-hooks' into 'dev'Mario2018-09-203-0/+22
| |\ | | | | | | | | | | | | Preempt hooks See merge request hubzilla/core!1279
| | * Add structure to permit_hookM.Dent (DM42.Net)2018-09-191-0/+7
| | |
| | * add hook: permit_hookM.Dent (DM42.Net)2018-09-193-7/+22
| | |
| * | Merge branch 'hook-docs' into 'dev'Mario2018-09-205-7/+93
| |\ \ | | | | | | | | | | | | | | | | Document new hooks See merge request hubzilla/core!1278
| | * | Document new hooksM.Dent (DM42.Net)2018-09-195-7/+93
| | |/
* | / deal with the ability to provide settings url in apd files in include/nav.phpMario Vavti2018-09-201-1/+8
|/ /
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-201-1/+1
|\ \ | |/ |/|
| * fix setupzotlabs2018-09-191-1/+1
| |
* | allow a second url in apd files for settings, hide pin and star buttons in ↵Mario Vavti2018-09-193-13/+22
| | | | | | | | edit mode and use strpos() instead of strstr() in some places
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-196-16/+41
|\|
| * this was neededzotlabs2018-09-181-1/+1
| |
| * missing autocomplete (e.g. mentions) in mod_photos commentszotlabs2018-09-181-2/+3
| |
| * Merge branch 'dev'zotlabs2018-09-1710-12/+210
| |\
| | * Merge branch 'patch-3' into 'dev'Mario2018-09-173-10/+34
| | |\ | | | | | | | | | | | | | | | | Save combined view while deleting or recalling first message in thread See merge request hubzilla/core!1273
| | | * Update zot.phpMax Kostikov2018-09-171-1/+1
| | | |
| | | * Update message.phpMax Kostikov2018-09-171-1/+1
| | | |
| | | * Update msglib.phpMax Kostikov2018-09-171-6/+6
| | | |
| | | * Update msglib.phpMax Kostikov2018-09-161-10/+6
| | | |
| | | * use common msg_drop functionMax Kostikov2018-09-151-25/+3
| | | |
| | | * Use common msg_drop functionMax Kostikov2018-09-151-25/+3
| | | |
| | | * formattingMax Kostikov2018-09-151-24/+21
| | | |
| | | * Create msglib.phpMax Kostikov2018-09-151-0/+35
| | | |
| | | * Add new fileMax Kostikov2018-09-151-0/+0
| | | |
| | | * unification with zot.php code for future reuseMax Kostikov2018-09-151-2/+2
| | | |
| | | * formattingMax Kostikov2018-09-151-1/+1
| | | |
| | | * Save combined view on calling first message in threadMax Kostikov2018-09-151-0/+20
| | | |
| | | * less data in selectMax Kostikov2018-09-151-1/+1
| | | |
| | | * formattingMax Kostikov2018-09-141-3/+3
| | | |
| | | * Save combined view while deleting first message in threadMax Kostikov2018-09-141-0/+20
| | | |
| * | | fix listeners table create and expire federation had a syntax errorzotlabs2018-09-172-5/+5
| | | |
* | | | remove superfluous commaMario Vavti2018-09-171-1/+1
| | | |
* | | | remove unused variableMario Vavti2018-09-171-1/+0
| | | |
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-171-4/+4
|\| | | | |/ / |/| |
| * | pdo install check requires namespacingzotlabs2018-09-171-4/+4
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-173-1/+15
|\ \ \
| * \ \ Merge branch 'trap-template-errors' into 'dev'Mario2018-09-171-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.Dent2018-09-141-1/+7
| | | | |
| * | | | Merge branch 'delete-attach-hook' into 'dev'Mario2018-09-171-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | delete_attach hook See merge request hubzilla/core!1275
| | * | | | Add attach_delete hookM.Dent (DM42.Net)2018-09-151-0/+5
| | | | | |
| * | | | | Merge branch 'app-list-hook' into 'dev'Mario2018-09-171-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_listM.Dent2018-09-161-0/+3
| | | | | | |
* | | | | | | seperate settings for mod networkMario Vavti2018-09-172-0/+143
|/ / / / / /
* | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-178-13/+98
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Some improvements to setup checks: image library and pdo supportzotlabs2018-09-161-2/+9
| | | | | |
| * | | | | Merge branch 'dev'zotlabs2018-09-1641-580/+371
| |\| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 10:52:27 +0000