Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add dreport_process hook | M.Dent | 2018-08-29 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-29 | 2 | -1/+3 |
|\ | |||||
| * | redirect stdout/stderr on cron command | zotlabs | 2018-08-28 | 2 | -1/+3 |
| | | |||||
* | | add paragonie and symfonie since ramsey/uuid appears to require them | Mario Vavti | 2018-08-28 | 14 | -0/+512 |
| | | |||||
* | | update composer libs and add ramsey/uuid | Mario Vavti | 2018-08-28 | 96 | -1241/+6276 |
| | | |||||
* | | remove distinct from network query again until performance issue is resolved ↵ | Mario Vavti | 2018-08-27 | 1 | -2/+2 |
| | | | | | | | | or another fix for the underlying problem is found | ||||
* | | Merge branch 'extend-convitems-dropdown' into 'dev' | Mario | 2018-08-27 | 3 | -2/+11 |
|\ \ | | | | | | | | | | | | | Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265 | ||||
| * | | Add hook to extend conv_item cog dropdown menu | M.Dent | 2018-08-26 | 2 | -0/+9 |
| | | | |||||
| * | | Get full page of items | M.Dent | 2018-08-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2018-08-27 | 5 | -11/+19 |
|\ \ \ | | | | | | | | | | | | | | | | | Add translation to missed strings in Wiki See merge request hubzilla/core!1264 | ||||
| * | | | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'revert-c16fda1c' into 'dev' | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!2 | ||||
| | * | | | Revert "Update wiki.tpl" | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
| |/ / / | | | | | | | | | This reverts commit c16fda1cb6fef84788d3045b0edff367d2978c98 | ||||
| * | | | Merge branch 'revert-ff1a0d21' into 'dev' | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!1 | ||||
| | * | | | Revert "Update wiki.tpl" | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| |/ / / | | | | | | | | | This reverts commit ff1a0d217ff769a2e6e622915cb7e9d9eff327b5 | ||||
| * | | | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update Wiki_page_history.php | Max Kostikov | 2018-08-25 | 1 | -3/+3 |
| | | | | |||||
| * | | | Update Wiki.php | Max Kostikov | 2018-08-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update NativeWikiPage.php | Max Kostikov | 2018-08-25 | 1 | -4/+4 |
| | | | | |||||
| * | | | Update Wiki_page_history.php | Max Kostikov | 2018-08-25 | 1 | -1/+4 |
| | | | | |||||
| * | | | Update Wiki.php | Max Kostikov | 2018-08-25 | 1 | -0/+2 |
| | | | | |||||
| * | | | Update NativeWikiPage.php | Max Kostikov | 2018-08-25 | 1 | -2/+5 |
| | | | | |||||
| * | | | Update nwiki_page_history.tpl | Max Kostikov | 2018-08-25 | 1 | -7/+7 |
| | | | | |||||
| * | | | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-27 | 0 | -0/+0 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Revert "Change main router request variable from 'q' to 'req'. This is ↵ | zotlabs | 2018-08-26 | 11 | -19/+19 |
| | | | | | | | | | | | | | | | | | | necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'." Reverting because this will only work with Apache and break nginx/other installations. This reverts commit 9367e9fe5a0125bf4c2f77909f2789c9dcd41e1e. | ||||
| * | | Change main router request variable from 'q' to 'req'. This is necessary to ↵ | zotlabs | 2018-08-26 | 11 | -19/+19 |
| | | | | | | | | | | | | implement search in the twitter api addon, because twitter requires use of the variable 'q'. | ||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-24 | 5 | -46/+88 |
|\| | | |||||
| * | | code cleanup | zotlabs | 2018-08-23 | 2 | -37/+52 |
| | | | |||||
| * | | first_post_date() (used by archive widget) - trigger the query options off ↵ | zotlabs | 2018-08-23 | 1 | -14/+15 |
| | | | | | | | | | | | | of the active module rather than rely on passed parameters | ||||
| * | | tweak archive widget for articles | zotlabs | 2018-08-22 | 4 | -7/+33 |
| | | | |||||
* | | | Merge branch 'dm42fixes' into 'dev' | Mario | 2018-08-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | fix exclusion of redmatrix theme See merge request hubzilla/core!1263 | ||||
| * | | | fix exclusion of redmatrix theme | M.Dent | 2018-08-23 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'patch-19' into 'dev' | Mario | 2018-08-24 | 2 | -259/+227 |
|\ \ \ | |/ / |/| | | | | | | | | Update Russian translation See merge request hubzilla/core!1262 | ||||
| * | | Update hstrings.php | Max Kostikov | 2018-08-22 | 1 | -31/+31 |
| | | | |||||
| * | | Update hmessages.po | Max Kostikov | 2018-08-22 | 1 | -228/+196 |
|/ / | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-22 | 6 | -20/+27 |
|\| | |||||
| * | profile likes - liker image was a bit large and didn't make a very pleasant ↵ | zotlabs | 2018-08-21 | 1 | -1/+1 |
| | | | | | | | | looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class | ||||
| * | add api_not_found hook | zotlabs | 2018-08-21 | 1 | -1/+4 |
| | | |||||
| * | Zot/Finger: ignore deleted hublocs | zotlabs | 2018-08-21 | 2 | -2/+2 |
| | | |||||
| * | more code optimisation | zotlabs | 2018-08-20 | 2 | -16/+20 |
| | | |||||
* | | Merge branch 'redbasic-addroomforfooter' into 'dev' | Mario | 2018-08-22 | 1 | -0/+3 |
|\ \ | | | | | | | | | | | | | Fix jumpy sidebars See merge request hubzilla/core!1261 | ||||
| * | | Fix jumpy sidebars | M.Dent | 2018-08-21 | 1 | -0/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-21 | 5 | -90/+101 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-20 | 4 | -59/+119 |
| |\ \ | |||||
| * | | | remove checkjs reloader from mod_display also | zotlabs | 2018-08-20 | 1 | -48/+42 |
| | | | | |||||
| * | | | Only show cover photos once per login session. After that they can get ↵ | zotlabs | 2018-08-20 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | annoying. If there is pushback on this, then it should perhaps be optional. | ||||
| * | | | channel page performance improvement: don't use "checkjs" with an associated ↵ | zotlabs | 2018-08-20 | 1 | -42/+44 |
| | | | | | | | | | | | | | | | | page reload. Wrap a static copy of the content in noscript tags instead. | ||||
| * | | | hubzilla core issue #1262 | zotlabs | 2018-08-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Suppress duplicate info() messages. This was done long for notice(), but ↵ | zotlabs | 2018-08-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | info() was overlooked at that time. |