aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* 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 a...zotlabs2018-02-271-0/+1
| | * move oauth_client management and guest access tokens to features rather than ...zotlabs2018-02-271-2/+2
| * | 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 m...zotlabs2018-02-261-1/+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 a...Andrew Manning2018-02-262-65/+77
* | | 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 en...Mario Vavti2018-02-242-2/+14
* | | An authorization token is received, but I had to modify the Request class in ...Andrew Manning2018-02-253-15/+63
* | | 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
| | * Usability and member experience: remove street address info from the default ...zotlabs2018-02-233-2/+3
| * | fix issues with DB update 1204Mario Vavti2018-02-231-3/+3
| |/
| * handle error logging in on cloud page (post method not implemented), politely...zotlabs2018-02-221-0/+3
| * cloud 'view-as-tiles' toggle wasn't available (at all) for guests and they ar...zotlabs2018-02-221-1/+4
| * provide DB compatibility for poll and voting implementations across several p...zotlabs2018-02-221-0/+34
* | Add channel ID to user_id in clients table. Added TODO comments about dynamic...Andrew Manning2018-02-242-12/+26
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-228-54/+6
|\|
| * also sort by id to not make mysql change the queryplan if offset is > 0 after...Mario Vavti2018-02-221-1/+1
| * remove the unused ZotDriver and ProtoDriver classeszotlabs2018-02-212-49/+0
| * move dreport from zot to libzotlabs2018-02-211-1/+1
| * move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-orgzotlabs2018-02-213-3/+3
| * Add 'Validate' button to new_channel page and disable submit until validated....zotlabs2018-02-201-0/+1
* | The authorization step with client registration and authorization code retrie...Andrew Manning2018-02-222-35/+100
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-20210-153/+4704
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-1/+1
| |\
| | * copy/paste error resulting in bad behaviourzotlabs2018-02-201-1/+1
| * | missing fileMario Vavti2018-02-201-0/+29
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-197-62/+84
| |\
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-191-1/+15
| | |\
| | * | updates 1201 and 1200 should return success for postgres. notifications: remo...Mario Vavti2018-02-193-8/+16
| | * | Merge pull request #980 from dawnbreak/devgit-marijus2018-02-193-53/+44
| | |\ \
| | | * | Refactor OAuth2Server a bit.Klaus Weidenbach2018-02-173-53/+44
| | * | | backport update 1201 to the new update system and move dummy update to 1202Mario Vavti2018-02-192-5/+28