Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | Add user_id = local_channel() to the where clause of updates | M.Dent | 2018-08-10 | 1 | -2/+3 |
| | | | |||||
* | | | Merge branch 'oauth2' into 'dev' | Mario | 2018-08-12 | 5 | -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.Dent | 2018-08-10 | 5 | -12/+81 |
| | |/ | |/| | |||||
* / | | Add translation for missed string | Max Kostikov | 2018-08-10 | 1 | -1/+1 |
|/ / | |||||
* | | bring some Zot6 libraries and interfaces to red/hubzilla | zotlabs | 2018-08-06 | 13 | -0/+7764 |
| | | |||||
* | | add app_options field | zotlabs | 2018-08-02 | 4 | -11/+35 |
| | | |||||
* | | hubzilla core issue #1258 | zotlabs | 2018-08-01 | 1 | -0/+4 |
| | | |||||
* | | When checking permissions ignore checking site "Block Public" settings in ↵ | zotlabs | 2018-07-30 | 3 | -3/+2 |
| | | | | | | | | cases where site permissions aren't applicable | ||||
* | | fix sql empty query error in db update 1216 | Mario Vavti | 2018-07-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-29 | 2 | -2/+6 |
|\ \ | |||||
| * \ | Merge branch 'patch-8' into 'dev' | Mario | 2018-07-28 | 1 | -1/+5 |
| |\ \ | | | | | | | | | | | | | | | | | Fix navbar missed translations See merge request hubzilla/core!1242 | ||||
| | * | | Update Apps.php | Max Kostikov | 2018-07-27 | 1 | -3/+4 |
| | | | | |||||
| | * | | Update Apps.php | Max Kostikov | 2018-07-27 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge branch 'patch-6' into 'dev' | Mario | 2018-07-28 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix duplicate transport displaying See merge request hubzilla/core!1240 | ||||
| | * | | | Fix duplicate transport displaying | kostikov | 2018-07-25 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | wrong class name | Mario Vavti | 2018-07-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix unsanitised xchan_name | zotlabs | 2018-07-28 | 1 | -0/+19 |
|/ / / | |||||
* | | | don't sync system apps | zotlabs | 2018-07-27 | 1 | -3/+4 |
| | | | |||||
* | | | app delete issue with base installed apps and app photo being reloaded ↵ | zotlabs | 2018-07-27 | 1 | -19/+47 |
| | | | | | | | | | | | | uneccessarily | ||||
* | | | app update and ownership issues | zotlabs | 2018-07-27 | 1 | -7/+50 |
|/ / | |||||
* | | checkjs fix ($page not bin-hex in all cases) | zotlabs | 2018-07-19 | 1 | -2/+2 |
| | | |||||
* | | query filter was a bit greedy | zotlabs | 2018-07-18 | 1 | -1/+0 |
| | | |||||
* | | mangled urls on redirects | zotlabs | 2018-07-18 | 5 | -12/+13 |
| | | |||||
* | | spellcheck | zotlabs | 2018-07-15 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-15 | 1 | -2/+0 |
|\| | |||||
| * | this is messing with names containing a comma and is superfluous now | Mario Vavti | 2018-07-06 | 1 | -2/+0 |
| | | |||||
* | | functions to support module and widget registration by plugins. These have ↵ | zotlabs | 2018-07-12 | 5 | -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 available | zotlabs | 2018-07-05 | 1 | -1/+1 |
| | |||||
* | app store fixes | zotlabs | 2018-07-05 | 1 | -18/+13 |
| | |||||
* | appstore changes | zotlabs | 2018-07-04 | 4 | -12/+103 |
| | |||||
* | order nouveau by created instead of received since ordering by received ↵ | Mario Vavti | 2018-07-04 | 1 | -2/+2 |
| | | | | returns unexpected results once old expired items get re-imported | ||||
* | Revert "add the missing link to manage privacy groups" | Mario Vavti | 2018-07-04 | 1 | -8/+0 |
| | | | | This reverts commit c28e27357a1ce700b91021344050ec531bce3889. | ||||
* | some changes to support plume | zotlabs | 2018-07-01 | 1 | -1/+2 |
| | |||||
* | propagate expired posts to other networks | zotlabs | 2018-06-30 | 1 | -3/+8 |
| | |||||
* | add the missing link to manage privacy groups | zotlabs | 2018-06-28 | 1 | -0/+8 |
| | |||||
* | plugins -> addons | zotlabs | 2018-06-28 | 3 | -23/+23 |
| |