aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | |/ | |/|
* / | Add translation for missed stringMax Kostikov2018-08-101-1/+1
|/ /
* | bring some Zot6 libraries and interfaces to red/hubzillazotlabs2018-08-0613-0/+7764
| |
* | add app_options fieldzotlabs2018-08-024-11/+35
| |
* | hubzilla core issue #1258zotlabs2018-08-011-0/+4
| |
* | When checking permissions ignore checking site "Block Public" settings in ↵zotlabs2018-07-303-3/+2
| | | | | | | | cases where site permissions aren't applicable
* | fix sql empty query error in db update 1216Mario Vavti2018-07-291-1/+1
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-292-2/+6
|\ \
| * \ Merge branch 'patch-8' into 'dev'Mario2018-07-281-1/+5
| |\ \ | | | | | | | | | | | | | | | | Fix navbar missed translations See merge request hubzilla/core!1242
| | * | Update Apps.phpMax Kostikov2018-07-271-3/+4
| | | |
| | * | Update Apps.phpMax Kostikov2018-07-271-1/+4
| | | |
| * | | Merge branch 'patch-6' into 'dev'Mario2018-07-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix duplicate transport displaying See merge request hubzilla/core!1240
| | * | | Fix duplicate transport displayingkostikov2018-07-251-1/+1
| | |/ /
* | | | wrong class nameMario Vavti2018-07-291-1/+1
| | | |
* | | | fix unsanitised xchan_namezotlabs2018-07-281-0/+19
|/ / /
* | | don't sync system appszotlabs2018-07-271-3/+4
| | |
* | | app delete issue with base installed apps and app photo being reloaded ↵zotlabs2018-07-271-19/+47
| | | | | | | | | | | | uneccessarily
* | | app update and ownership issueszotlabs2018-07-271-7/+50
|/ /
* | checkjs fix ($page not bin-hex in all cases)zotlabs2018-07-191-2/+2
| |
* | query filter was a bit greedyzotlabs2018-07-181-1/+0
| |
* | mangled urls on redirectszotlabs2018-07-185-12/+13
| |
* | spellcheckzotlabs2018-07-151-2/+2
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-151-2/+0
|\|
| * this is messing with names containing a comma and is superfluous nowMario Vavti2018-07-061-2/+0
| |
* | functions to support module and widget registration by plugins. These have ↵zotlabs2018-07-125-23/+174
|/ | | | identical construction to core modules and widgets and are registered just like hooks during addon load. Also additional Apps functions addon_app_installed() and system_app_installed() which will eventually replace feature_installed() for features which are converted to apps. The convention being used is that the module associated with the app calls the appropriate *_app_installed() function and if not present emits descriptive text about the app and exits. This allows one to click on an 'available' app and learn about it. Once installed, the app module behaves normally and may offer functionality or what once were addon settings on the settings/featured page. Refer to zap-addons in the zap repository for examples of how this is being used to eliminate the 'additional features' and 'addon settings' pages.
* don't provide manage apps button when viewing all availablezotlabs2018-07-051-1/+1
|
* app store fixeszotlabs2018-07-051-18/+13
|
* appstore changeszotlabs2018-07-044-12/+103
|
* order nouveau by created instead of received since ordering by received ↵Mario Vavti2018-07-041-2/+2
| | | | returns unexpected results once old expired items get re-imported
* Revert "add the missing link to manage privacy groups"Mario Vavti2018-07-041-8/+0
| | | | This reverts commit c28e27357a1ce700b91021344050ec531bce3889.
* some changes to support plumezotlabs2018-07-011-1/+2
|
* propagate expired posts to other networkszotlabs2018-06-301-3/+8
|
* add the missing link to manage privacy groupszotlabs2018-06-281-0/+8
|