Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'dev' | zotlabs | 2018-09-20 | 3 | -3/+51 | |
|\ | ||||||
| * | move connection filtering setting from network to connections, provide a ↵ | Mario Vavti | 2018-09-20 | 2 | -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 dev | Mario Vavti | 2018-09-20 | 1 | -0/+19 | |
| |\ | ||||||
| | * | 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 | 1 | -0/+12 | |
| | | | ||||||
| * | | deal with the ability to provide settings url in apd files in include/nav.php | Mario Vavti | 2018-09-20 | 1 | -1/+8 | |
| |/ | ||||||
* / | bookmarks fail to sync | zotlabs | 2018-09-20 | 1 | -2/+3 | |
|/ | ||||||
* | 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 '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 'dev' | zotlabs | 2018-09-16 | 5 | -383/+31 | |
|\| | | ||||||
| * | | remove network_tabs() which has been deprecated and replaced by ↵ | Mario Vavti | 2018-09-13 | 1 | -113/+0 | |
| | | | | | | | | | | | | activity_{order, filters} widgets | |||||
| * | | move chat from feature to apps | Mario Vavti | 2018-09-13 | 2 | -11/+1 | |
| | | | ||||||
| * | | remove profile_tabs() which has been deprecated and replaced by channel_apps() | Mario Vavti | 2018-09-13 | 2 | -201/+1 | |
| | | | ||||||
| * | | Merge branch 'patch-1' into 'dev' | Mario | 2018-09-12 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | | | | | | | | | z_fetch_url with case insensitive headers See merge request hubzilla/core!1271 | |||||
| | * | | Update network.php | Max Kostikov | 2018-09-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | more feature to app transition | Mario Vavti | 2018-09-12 | 1 | -30/+26 | |
| | | | | ||||||
| * | | | Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity | Mario Vavti | 2018-09-12 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | mpre feature to app transition | Mario Vavti | 2018-09-12 | 1 | -27/+0 | |
| |/ / | ||||||
* | | | do not sync the channel_moved field | zotlabs | 2018-09-16 | 2 | -8/+9 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-09-10 | 1 | -10/+0 | |
|\| | | ||||||
| * | | move cards from features to apps | Mario Vavti | 2018-09-10 | 1 | -10/+0 | |
| |/ | ||||||
* / | important hyperdrive component | zotlabs | 2018-09-09 | 1 | -2/+9 | |
|/ | ||||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-09-05 | 1 | -7/+22 | |
|\ | ||||||
| * | Corrected resubmit of fixes to Authors unable to comment on posts they ↵ | M.Dent | 2018-09-04 | 1 | -7/+22 | |
| | | | | | | | | authored when owned by others. | |||||
| * | Revert "Fix: Authors unable to comment on posts they authored when under ↵ | Mario Vavti | 2018-09-03 | 1 | -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' | Mario | 2018-09-02 | 1 | -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.Dent | 2018-09-01 | 1 | -2/+15 | |
| | | | | | | | | | | | | others in certain circumstances. | |||||
* | | | detect and automatically repair duplicate plugin hook scenarios. | zotlabs | 2018-09-05 | 1 | -16/+40 | |
|/ / | ||||||
* | | Merge branch 'call-hooks-optimization' into 'dev' | Mario | 2018-08-30 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | Micro-optimization to call_hooks() See merge request hubzilla/core!1267 | |||||
| * | | Micro-optimization to call_hooks() | M.Dent | 2018-08-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'add-delivery-status-info' into 'dev' | Mario | 2018-08-30 | 1 | -0/+1 | |
|\ \ \ | | |/ | |/| | | | | | | | Add dreport_process hook See merge request hubzilla/core!1266 | |||||
| * | | Add dreport_process hook | M.Dent | 2018-08-29 | 1 | -0/+1 | |
| |/ |