aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* provide a return path from settings pagesMario Vavti2018-09-211-0/+2
|
* Merge branch 'dev'zotlabs2018-09-203-3/+51
|\
| * move connection filtering setting from network to connections, provide a ↵Mario Vavti2018-09-202-3/+25
| | | | | | | | 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-201-0/+19
| |\
| | * Add structure to permit_hookM.Dent (DM42.Net)2018-09-191-0/+7
| | |
| | * add hook: permit_hookM.Dent (DM42.Net)2018-09-191-0/+12
| | |
| * | deal with the ability to provide settings url in apd files in include/nav.phpMario Vavti2018-09-201-1/+8
| |/
* / bookmarks fail to synczotlabs2018-09-201-2/+3
|/
* 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
| |
* | 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 'dev'zotlabs2018-09-165-383/+31
|\| |
| * | remove network_tabs() which has been deprecated and replaced by ↵Mario Vavti2018-09-131-113/+0
| | | | | | | | | | | | activity_{order, filters} widgets
| * | move chat from feature to appsMario Vavti2018-09-132-11/+1
| | |
| * | remove profile_tabs() which has been deprecated and replaced by channel_apps()Mario Vavti2018-09-132-201/+1
| | |
| * | Merge branch 'patch-1' into 'dev'Mario2018-09-121-1/+1
| |\ \ | | | | | | | | | | | | | | | | z_fetch_url with case insensitive headers See merge request hubzilla/core!1271
| | * | Update network.phpMax Kostikov2018-09-101-1/+1
| | | |
| * | | more feature to app transitionMario Vavti2018-09-121-30/+26
| | | |
| * | | Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in EntityMario Vavti2018-09-121-0/+2
| | | |
| * | | mpre feature to app transitionMario Vavti2018-09-121-27/+0
| |/ /
* | | do not sync the channel_moved fieldzotlabs2018-09-162-8/+9
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-09-101-10/+0
|\| |
| * | move cards from features to appsMario Vavti2018-09-101-10/+0
| |/
* / important hyperdrive componentzotlabs2018-09-091-2/+9
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-09-051-7/+22
|\
| * Corrected resubmit of fixes to Authors unable to comment on posts they ↵M.Dent2018-09-041-7/+22
| | | | | | | | authored when owned by others.
| * Revert "Fix: Authors unable to comment on posts they authored when under ↵Mario Vavti2018-09-031-15/+2
| | | | | | | | | | | | | | | | owned by others in certain circumstances." This reverts commit e2824f925964fbfe160255de6e733b4c2de3cecb. Reverting because it breaks forum mentions.
| * Merge branch 'add-delivery-status-info' into 'dev'Mario2018-09-021-2/+15
| |\ | | | | | | | | | | | | Fix: Authors unable to comment on posts they authored when under owned by others… See merge request hubzilla/core!1268
| | * Fix: Authors unable to comment on posts they authored when under owned by ↵M.Dent2018-09-011-2/+15
| | | | | | | | | | | | others in certain circumstances.
* | | detect and automatically repair duplicate plugin hook scenarios.zotlabs2018-09-051-16/+40
|/ /
* | Merge branch 'call-hooks-optimization' into 'dev'Mario2018-08-301-1/+1
|\ \ | | | | | | | | | | | | Micro-optimization to call_hooks() See merge request hubzilla/core!1267
| * | Micro-optimization to call_hooks()M.Dent2018-08-291-1/+1
| | |
* | | Merge branch 'add-delivery-status-info' into 'dev'Mario2018-08-301-0/+1
|\ \ \ | | |/ | |/| | | | | | | Add dreport_process hook See merge request hubzilla/core!1266
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 01:14:50 +0000