aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Corrected resubmit of fixes to Authors unable to comment on posts they ↵M.Dent2018-09-041-5/+7
| | | | authored when owned by others.
* Revert "Fix: Authors unable to comment on posts they authored when under ↵Mario Vavti2018-09-031-7/+5
| | | | | | | | 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-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.Dent2018-09-011-5/+7
| | | | | | | | others in certain circumstances.
* | fix undefined constant warningMario Vavti2018-09-011-1/+1
| |
* | do not count sys channel in totalsMario Vavti2018-09-011-1/+1
| |
* | update 1218: missing default value for pgMario Vavti2018-08-311-2/+2
| |
* | db update to get rid of bogus activitypub xchans which got created due to a ↵Mario Vavti2018-08-291-0/+26
|/ | | | bug in the pubcrawl addon
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-291-0/+2
|\
| * redirect stdout/stderr on cron commandzotlabs2018-08-281-0/+2
| |
| * Revert "Change main router request variable from 'q' to 'req'. This is ↵zotlabs2018-08-266-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 ↵zotlabs2018-08-266-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 Vavti2018-08-271-2/+2
| | | | | | | | or another fix for the underlying problem is found
* | Merge branch 'extend-convitems-dropdown' into 'dev'Mario2018-08-272-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 menuM.Dent2018-08-261-0/+5
| | |
| * | Get full page of itemsM.Dent2018-08-231-2/+2
| | |
* | | Update Wiki_page_history.phpMax Kostikov2018-08-251-3/+3
| | |
* | | Update Wiki.phpMax Kostikov2018-08-251-2/+2
| | |
* | | Update NativeWikiPage.phpMax Kostikov2018-08-251-4/+4
| | |
* | | Update Wiki_page_history.phpMax Kostikov2018-08-251-1/+4
| | |
* | | Update Wiki.phpMax Kostikov2018-08-251-0/+2
| | |
* | | Update NativeWikiPage.phpMax Kostikov2018-08-251-2/+5
| | |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-242-5/+18
|\ \ \ | |/ / |/| / | |/
| * tweak archive widget for articleszotlabs2018-08-222-5/+18
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-223-17/+21
|\|
| * Zot/Finger: ignore deleted hublocszotlabs2018-08-211-1/+1
| |
| * more code optimisationzotlabs2018-08-202-16/+20
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-213-90/+96
|\|
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-201-8/+11
| |\
| * | remove checkjs reloader from mod_display alsozotlabs2018-08-201-48/+42
| | |
| * | Only show cover photos once per login session. After that they can get ↵zotlabs2018-08-201-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 ↵zotlabs2018-08-201-42/+44
| | | | | | | | | | | | page reload. Wrap a static copy of the content in noscript tags instead.
* | | Merge branch 'patch-17' into 'master'Mario2018-08-211-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 devMario Vavti2018-08-164-2/+559
|\|
| * missing fileszotlabs2018-08-152-0/+554
| |
| * possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebarzotlabs2018-08-152-2/+5
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-151-1/+1
|\|
| * issue with mdpost addon and archive.org links which contain a full url as a ↵zotlabs2018-08-131-1/+1
| | | | | | | | path/query component
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-146-42/+94
|\|
| * hubloc DB changes needed for z6zotlabs2018-08-131-0/+31
| |
| * oidc cleanup and discoveryzotlabs2018-08-134-29/+39
| |
| * minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to ↵zotlabs2018-08-132-15/+26
| | | | | | | | 'portable_id', fixed/simplified cgi auth mode
* | Fix root not added to internationalized template searchM.Dent2018-08-121-8/+11
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-121-1/+1
|\
| * prevent json-ld bombing, turn off browser autocomplete on channel sources ↵zotlabs2018-08-111-1/+1
| | | | | | | | creation
* | Merge branch 'oauth2-ui-pr' into 'dev'Mario2018-08-121-6/+29
|\ \ | | | | | | | | | | | | Oauth2 ui pr See merge request hubzilla/core!1255
| * | OAuth2 UI and settings updatesM.Dent2018-08-101-4/+26
| | |
| * | Add user_id = local_channel() to the where clause of updatesM.Dent2018-08-101-2/+3
| | |
* | | Merge branch 'oauth2' into 'dev'Mario2018-08-125-12/+81
|\ \ \ | | | | | | | | | | | | | | | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. See merge request hubzilla/core!1254
| * | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.M.Dent2018-08-105-12/+81
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 19:32:06 +0000