aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-02-2813-202/+305
|\
| * erge remote-tracking branch 'mike/master' into devMario Vavti2018-02-284-28/+58
| |\
| | * 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-272-0/+2
| | * move privacy groups to the newly created Access Control and Permissions tab. ...zotlabs2018-02-271-8/+9
| | * move oauth_client management and guest access tokens to features rather than ...zotlabs2018-02-272-18/+45
| * | typoMario Vavti2018-02-281-1/+1
| * | missed one index in the last updateMario Vavti2018-02-283-1/+26
| * | missed some string for translation - update stringsMario Vavti2018-02-282-163/+175
| * | bump versionMario Vavti2018-02-271-1/+1
| |/
| * fix syntax errorMario Vavti2018-02-271-1/+1
| * fix public stream app permission check to match the recent fixes to the Modulezotlabs2018-02-261-2/+7
| * change undo_post_tagging() to emit quoted tags rather than using underscore r...zotlabs2018-02-261-2/+9
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-26810-140777/+4356
| |\
| * | update directory fallback serverszotlabs2018-02-261-2/+0
| * | require directory servers to be using some modern form of encryption; which m...zotlabs2018-02-261-1/+2
| * | issues with delivery of edited posts to forumszotlabs2018-02-262-1/+23
| * | fix autoname testzotlabs2018-02-261-2/+5
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-26813-140847/+4362
|\ \ \ | | |/ | |/|
| * | update stringsMario Vavti2018-02-262-1301/+1493
| * | fix icon position and make string translatableMario Vavti2018-02-263-9/+21
| * | missing clearfixMario Vavti2018-02-261-1/+1
| * | fix minor issue with custom acl selectorMario Vavti2018-02-263-2/+4
| * | slightly improve custom acl selectorMario Vavti2018-02-263-13/+6
| * | change fontname in css and fix issue with unicode charactersMario Vavti2018-02-265-14/+6
| * | switch to fork-awesomeMario Vavti2018-02-26789-139427/+2741
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-2611-77/+60
| |\|
| | * provide opt-out link and text with notification emailszotlabs2018-02-253-1/+14
| | * mention the hidden setting for #972 in doc/hidden_configszotlabs2018-02-251-0/+1
| | * hubzilla issue #979 - alter image selection widget to accept/submit on choose...zotlabs2018-02-257-76/+45
| * | bump versioMario Vavti2018-02-261-1/+1
| * | another DB upgrade to address some long running maintenance queriesMario Vavti2018-02-263-3/+32
* | | Successful OAuth2 sequence demonstrated with the test vehicle, including an a...Andrew Manning2018-02-265-82/+137
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2514-16/+79
|\| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-254-9/+27
| |\|
| | * siteinfo.json - if hide_in_statistics is set only include the total channels ...zotlabs2018-02-241-4/+7
| | * make the profile photo image picker work correctly with multiple profiles.zotlabs2018-02-243-5/+20
| * | 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-2410-6/+51
* | | An authorization token is received, but I had to modify the Request class in ...Andrew Manning2018-02-254-16/+64
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2422-21/+306
|\| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-2414-17/+246
| |\|
| | * open_pubstream logic was messy and wrongzotlabs2018-02-231-1/+7
| | * style the buttons even morezotlabs2018-02-232-4/+4
| | * style the 'use existing' button a wee bitzotlabs2018-02-234-6/+4
| | * use embed photos javascript widget to select existing photos for profile and ...zotlabs2018-02-238-10/+233
| | * usability: click your own profile photo to change it instead of hunting it do...zotlabs2018-02-232-1/+2
| | * Usability and member experience: remove street address info from the default ...zotlabs2018-02-234-4/+5
| * | fix issues with DB update 1204Mario Vavti2018-02-231-3/+3
| |/
| * mod_new_channel: don't require nickname validation after name validation (whi...zotlabs2018-02-221-0/+3