Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |||||
| * | | Add hook to extend conv_item cog dropdown menu | M.Dent | 2018-08-26 | 1 | -0/+5 | |
| | | | ||||||
| * | | Get full page of items | M.Dent | 2018-08-23 | 1 | -2/+2 | |
| | | | ||||||
* | | | 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 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-24 | 2 | -5/+18 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | tweak archive widget for articles | zotlabs | 2018-08-22 | 2 | -5/+18 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-22 | 3 | -17/+21 | |
|\| | ||||||
| * | Zot/Finger: ignore deleted hublocs | zotlabs | 2018-08-21 | 1 | -1/+1 | |
| | | ||||||
| * | more code optimisation | zotlabs | 2018-08-20 | 2 | -16/+20 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-21 | 3 | -90/+96 | |
|\| | ||||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-20 | 1 | -8/+11 | |
| |\ | ||||||
| * | | 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. | |||||
* | | | Merge branch 'patch-17' into 'master' | Mario | 2018-08-21 | 1 | -1/+2 | |
| |/ |/| | | | | | | | | | | | | | | | Add missed app 'Order Apps' See merge request hubzilla/core!1258 (cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7) 6086a70e Add missed app 'Order Apps' | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-16 | 4 | -2/+559 | |
|\| | ||||||
| * | missing files | zotlabs | 2018-08-15 | 2 | -0/+554 | |
| | | ||||||
| * | possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar | zotlabs | 2018-08-15 | 2 | -2/+5 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-15 | 1 | -1/+1 | |
|\| | ||||||
| * | issue with mdpost addon and archive.org links which contain a full url as a ↵ | zotlabs | 2018-08-13 | 1 | -1/+1 | |
| | | | | | | | | path/query component | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-14 | 6 | -42/+94 | |
|\| | ||||||
| * | hubloc DB changes needed for z6 | zotlabs | 2018-08-13 | 1 | -0/+31 | |
| | | ||||||
| * | oidc cleanup and discovery | zotlabs | 2018-08-13 | 4 | -29/+39 | |
| | | ||||||
| * | minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to ↵ | zotlabs | 2018-08-13 | 2 | -15/+26 | |
| | | | | | | | | 'portable_id', fixed/simplified cgi auth mode | |||||
* | | Fix root not added to internationalized template search | M.Dent | 2018-08-12 | 1 | -8/+11 | |
|/ | ||||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-12 | 1 | -1/+1 | |
|\ | ||||||
| * | prevent json-ld bombing, turn off browser autocomplete on channel sources ↵ | zotlabs | 2018-08-11 | 1 | -1/+1 | |
| | | | | | | | | creation | |||||
* | | Merge branch 'oauth2-ui-pr' into 'dev' | Mario | 2018-08-12 | 1 | -6/+29 | |
|\ \ | | | | | | | | | | | | | Oauth2 ui pr See merge request hubzilla/core!1255 | |||||
| * | | OAuth2 UI and settings updates | M.Dent | 2018-08-10 | 1 | -4/+26 | |
| | | |