Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-19 | 2 | -5/+5 |
|\ | |||||
| * | Merge branch 'dev' | zotlabs | 2018-09-17 | 4 | -1/+149 |
| |\ | |||||
| * | | fix listeners table create and expire federation had a syntax error | zotlabs | 2018-09-17 | 2 | -5/+5 |
| | | | |||||
* | | | 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 |
|\| | | |/ |/| | |||||
| * | pdo install check requires namespacing | zotlabs | 2018-09-17 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-17 | 1 | -0/+3 |
|\ \ | |||||
| * \ | 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 | 1 | -0/+128 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-17 | 2 | -2/+56 |
|\ \ \ | | |/ | |/| | |||||
| * | | Some improvements to setup checks: image library and pdo support | zotlabs | 2018-09-16 | 1 | -2/+9 |
| | | | |||||
| * | | Merge branch 'dev' | zotlabs | 2018-09-16 | 21 | -174/+317 |
| |\| | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-09-10 | 7 | -33/+58 |
| |\ \ | |||||
| * | | | important hyperdrive component | zotlabs | 2018-09-09 | 1 | -0/+47 |
| | | | | |||||
* | | | | prepare submodule to interact with route | Mario Vavti | 2018-09-17 | 2 | -1/+18 |
| |_|/ |/| | | |||||
* | | | appification of the lang module | Mario Vavti | 2018-09-16 | 1 | -2/+17 |
| | | | |||||
* | | | appify poke | Mario Vavti | 2018-09-15 | 1 | -2/+19 |
| | | | |||||
* | | | appify mood | Mario Vavti | 2018-09-15 | 2 | -3/+24 |
| | | | |||||
* | | | appify invite | Mario Vavti | 2018-09-15 | 2 | -5/+19 |
| | | | |||||
* | | | appify cdav stuff. WARNING: if you use caldav or carddav from a client or ↵ | Mario Vavti | 2018-09-15 | 1 | -5/+47 |
| | | | | | | | | | | | | the webinterface you will need to enable those apps to make things work again | ||||
* | | | remove network_tabs() which has been deprecated and replaced by ↵ | Mario Vavti | 2018-09-13 | 3 | -10/+6 |
| | | | | | | | | | | | | activity_{order, filters} widgets | ||||
* | | | move chat from feature to apps | Mario Vavti | 2018-09-13 | 3 | -33/+42 |
| | | | |||||
* | | | remove profile_tabs() which has been deprecated and replaced by channel_apps() | Mario Vavti | 2018-09-13 | 7 | -13/+3 |
| | | | |||||
* | | | mpre feature to app transition | Mario Vavti | 2018-09-12 | 5 | -100/+137 |
| | | | |||||
* | | | include item.title in /network and /channel search | Mario Vavti | 2018-09-11 | 2 | -2/+4 |
| |/ |/| | |||||
* | | move cards from features to apps | Mario Vavti | 2018-09-10 | 2 | -22/+31 |
| | | |||||
* | | missing text | Mario Vavti | 2018-09-07 | 1 | -1/+1 |
| | | |||||
* | | provide a noscript_content switch for mod channel and display | Mario Vavti | 2018-09-07 | 2 | -7/+22 |
| | | |||||
* | | install bootstrap via composer | Mario Vavti | 2018-09-07 | 1 | -2/+2 |
| | | |||||
* | | apps: change page title to available/installed, display install action label ↵ | Mario Vavti | 2018-09-07 | 2 | -2/+3 |
|/ | | | | in button and use different icons for installable and updateable apps | ||||
* | move str_replace inside if clause | Mario Vavti | 2018-09-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix-authorcomment-fix' into 'dev' | Mario | 2018-09-05 | 1 | -5/+7 |
|\ | | | | | | | | | Corrected resubmit of fixes to Authors unable to comment on posts they authored… See merge request hubzilla/core!1269 | ||||
| * | Corrected resubmit of fixes to Authors unable to comment on posts they ↵ | M.Dent | 2018-09-04 | 1 | -5/+7 |
| | | | | | | | | authored when owned by others. | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-05 | 1 | -7/+5 |
|\| | |||||
| * | Revert "Fix: Authors unable to comment on posts they authored when under ↵ | Mario Vavti | 2018-09-03 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | owned by others in certain circumstances." This reverts commit e2824f925964fbfe160255de6e733b4c2de3cecb. Reverting because it breaks forum mentions. | ||||
* | | instead of not displaying the cover-photo at all after first page load, load ↵ | Mario Vavti | 2018-09-05 | 1 | -2/+4 |
|/ | | | | the page with the cover slided up. change pointer to n-resize if cover is not slid. | ||||
* | Merge branch 'add-delivery-status-info' into 'dev' | Mario | 2018-09-02 | 1 | -5/+7 |
|\ | | | | | | | | | 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 | -5/+7 |
| | | | | | | | | others in certain circumstances. | ||||
* | | fix undefined constant warning | Mario Vavti | 2018-09-01 | 1 | -1/+1 |
| | | |||||
* | | do not count sys channel in totals | Mario Vavti | 2018-09-01 | 1 | -1/+1 |
| | | |||||
* | | update 1218: missing default value for pg | Mario Vavti | 2018-08-31 | 1 | -2/+2 |
| | | |||||
* | | db update to get rid of bogus activitypub xchans which got created due to a ↵ | Mario Vavti | 2018-08-29 | 1 | -0/+26 |
|/ | | | | bug in the pubcrawl addon | ||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-29 | 1 | -0/+2 |
|\ | |||||
| * | redirect stdout/stderr on cron command | zotlabs | 2018-08-28 | 1 | -0/+2 |
| | | |||||
| * | Revert "Change main router request variable from 'q' to 'req'. This is ↵ | zotlabs | 2018-08-26 | 6 | -7/+7 |
| | | | | | | | | | | | | 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 | 6 | -7/+7 |
| | | | | | | | | implement search in the twitter api addon, because twitter requires use of the variable 'q'. | ||||
* | | 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 | 2 | -2/+7 |
|\ \ | | | | | | | | | | | | | Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265 |