aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-053-11/+37
|\
| * fix some issues with friend suggestions on standalone sites with no ↵zotlabs2018-03-042-2/+7
| | | | | | | | 'suggestme' volunteers. This wrongly pulled up a site directory suggesting everybody on the site. While a better outcome than finding nobody, this does not fit with our ethical design goals. If there are no friends of friends, we will only suggest those who volunteer to be on the default suggestion list. Also do not attempt to load poco data from dead sites.
| * bugfix: unable to reset profile fields to defaults in admin/profs by ↵zotlabs2018-03-041-9/+30
| | | | | | | | emptying the textarea
* | Merge branch 'dev' into oauth2Andrew Manning2018-03-0413-52/+256
|\|
| * add dummy f= arg to suggestion urls, use directory version of suggest for ↵zotlabs2018-03-032-4/+4
| | | | | | | | newmember link instead of the suggest module as the UI is prettier.
| * There was no pdl for mod_thing; add one because it's only a link away from ↵zotlabs2018-03-031-0/+5
| | | | | | | | profile creation and remains on that page until you go elsewhere and new members may need help to find their way out
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-022-0/+35
| |\
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-023-7/+18
| | |\
| | * | update DB update 1205 to mitigateMario Vavti2018-03-021-0/+11
| | | | | | | | | | | | | | | | ERROR 1069 (42000): Too many keys specified; max 64 keys allowed
| | * | db update to drop index resource_type. we have uid_resource_type now.Mario Vavti2018-03-021-0/+24
| | | |
| * | | string change "Channel added" -> "Connection added"zotlabs2018-03-021-1/+1
| | | |
| * | | sort settings/featuredzotlabs2018-03-021-3/+16
| | |/ | |/|
| * | background work for caldav integration continued, modify mod_follow to allow ↵zotlabs2018-03-021-4/+14
| | | | | | | | | | | | it to be called from ajax without redirecting.
| * | add federation property to webfingerzotlabs2018-03-011-1/+2
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-011-30/+87
| |\|
| | * Merge pull request #983 from dawnbreak/QA_testinggit-marijus2018-03-011-30/+87
| | |\ | | | | | | | | :white_check_mark: Unit Test for HTTPSig.
| | | * :white_check_mark: Unit Test for HTTPSig.Klaus Weidenbach2018-02-281-30/+87
| | | |
| * | | sigh - missed two stringszotlabs2018-03-011-2/+2
| |/ /
| * | several email validation issueszotlabs2018-02-281-5/+6
| | |
| * | Create one and only one 'registration successful, check your email' popup.zotlabs2018-02-281-4/+2
| | |
| * | hide newmember widget if a new account was used to create a clone of an old ↵zotlabs2018-02-281-0/+6
| | | | | | | | | | | | channel
| * | provide new member widget which sits beneath the notifications for the first ↵zotlabs2018-02-282-1/+78
| | | | | | | | | | | | 60 days after an account creation.
| * | important bugfix: if logged in locally and mod_display returns nothing owned ↵zotlabs2018-02-281-2/+3
| |/ | | | | | | by your uid, retry with known public uids rather than issue 'permission denied'. Affects the ability to view search results for otherwise public posts 'in context'.
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-285-8/+34
|\|
| * erge remote-tracking branch 'mike/master' into devMario Vavti2018-02-282-4/+5
| |\
| | * rename Addon/Feature settings to addon settings [string change]zotlabs2018-02-272-2/+2
| | |
| | * provide usage hint on addon settings page to save each panel before opening ↵zotlabs2018-02-271-0/+1
| | | | | | | | | | | | another. [String change, not for 3.2]
| | * move oauth_client management and guest access tokens to features rather than ↵zotlabs2018-02-271-2/+2
| | | | | | | | | | | | auto-enabling at various feature levels. This involves string changes and should *not* go into 3.2RC.
| * | typoMario Vavti2018-02-281-1/+1
| | |
| * | missed one index in the last updateMario Vavti2018-02-281-0/+24
| | |
| * | missed some string for translation - update stringsMario Vavti2018-02-281-3/+3
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-265-9/+51
| |\
| * | require directory servers to be using some modern form of encryption; which ↵zotlabs2018-02-261-1/+2
| | | | | | | | | | | | means we only currently have 2.
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-263-4/+43
|\ \ \ | | |/ | |/|
| * | fix icon position and make string translatableMario Vavti2018-02-261-3/+6
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-261-1/+10
| |\|
| | * provide opt-out link and text with notification emailszotlabs2018-02-251-1/+10
| | |
| * | another DB upgrade to address some long running maintenance queriesMario Vavti2018-02-261-0/+27
| | |
* | | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵Andrew Manning2018-02-262-65/+77
| | | | | | | | | | | | authenticated API call using an access_token.
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-253-6/+31
|\| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-251-3/+16
| |\|
| | * make the profile photo image picker work correctly with multiple profiles.zotlabs2018-02-241-3/+16
| | |
| * | do not overwrite abook flags if we are not ownerMario Vavti2018-02-251-1/+1
| | |
| * | mark connections where we do not have post_comments permissions with an no ↵Mario Vavti2018-02-242-2/+14
| | | | | | | | | | | | entry sign.
* | | An authorization token is received, but I had to modify the Request class in ↵Andrew Manning2018-02-253-15/+63
| | | | | | | | | | | | vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST.
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2411-11/+66
|\| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-248-10/+25
| |\|
| | * open_pubstream logic was messy and wrongzotlabs2018-02-231-1/+7
| | |
| | * style the 'use existing' button a wee bitzotlabs2018-02-232-2/+2
| | |
| | * use embed photos javascript widget to select existing photos for profile and ↵zotlabs2018-02-234-7/+15
| | | | | | | | | | | | cover photos