aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* 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 oth...M.Dent2018-09-011-5/+7
* | 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 b...Mario Vavti2018-08-291-0/+26
|/
* 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 necess...zotlabs2018-08-266-7/+7
| * Change main router request variable from 'q' to 'req'. This is necessary to i...zotlabs2018-08-266-7/+7
* | remove distinct from network query again until performance issue is resolved ...Mario Vavti2018-08-271-2/+2
* | Merge branch 'extend-convitems-dropdown' into 'dev'Mario2018-08-272-2/+7
|\ \
| * | 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 annoyi...zotlabs2018-08-201-0/+10
| * | channel page performance improvement: don't use "checkjs" with an associated ...zotlabs2018-08-201-42/+44
* | | Merge branch 'patch-17' into 'master'Mario2018-08-211-1/+2
| |/ |/|
* | 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 p...zotlabs2018-08-131-1/+1
* | 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 'port...zotlabs2018-08-132-15/+26
* | 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 cre...zotlabs2018-08-111-1/+1
* | Merge branch 'oauth2-ui-pr' into 'dev'Mario2018-08-121-6/+29
|\ \
| * | 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.M.Dent2018-08-105-12/+81
| | |/ | |/|
* / | Add translation for missed stringMax Kostikov2018-08-101-1/+1
|/ /
* | bring some Zot6 libraries and interfaces to red/hubzillazotlabs2018-08-0613-0/+7764