aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵zotlabs2018-02-257-76/+45
| | | | | | | | | | | | choose (jot, wiki, cover_photo, profile_photo)
| * | 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 ↵Andrew Manning2018-02-265-82/+137
| | | | | | | | | | | | authenticated API call using an access_token.
* | | 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
| | | | | | | | | | | | count and no other statistical info
| | * 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 ↵Mario Vavti2018-02-2410-6/+51
| | | | | | | | | | | | entry sign.
* | | An authorization token is received, but I had to modify the Request class in ↵Andrew Manning2018-02-254-16/+64
| | | | | | | | | | | | vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST.
* | | 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
| | | | | | | | | | | | cover photos
| | * usability: click your own profile photo to change it instead of hunting it ↵zotlabs2018-02-232-1/+2
| | | | | | | | | | | | down in the profile edit navmenu. We still need work on the 'or use a photo from your albums' to use something like the photo selection widget in the post editor as you otherwise have to track down the 'use as profile photo' entry in the photo detail navmenu instead of just clicking an image.
| | * Usability and member experience: remove street address info from the default ↵zotlabs2018-02-234-4/+5
| | | | | | | | | | | | basic profile fields, mention that the site banner can be full HTML, mention on the techlevel setting that this also controls what additional features may be visible.
| * | fix issues with DB update 1204Mario Vavti2018-02-231-3/+3
| |/
| * mod_new_channel: don't require nickname validation after name validation ↵zotlabs2018-02-221-0/+3
| | | | | | | | (which generates a valid nickname). Enable the submit button as long as there are no errors.
| * handle error logging in on cloud page (post method not implemented), ↵zotlabs2018-02-221-0/+3
| | | | | | | | politely ask viewer to refresh the page rather than alert 'unknown error'.
| * cloud 'view-as-tiles' toggle wasn't available (at all) for guests and they ↵zotlabs2018-02-222-3/+7
| | | | | | | | are the most likely to prefer that view. Fix that and make tiles the default view for guests, and list mode the default view for the channel owner.
| * provide DB compatibility for poll and voting implementations across several ↵zotlabs2018-02-224-1/+47
| | | | | | | | platforms
* | Add channel ID to user_id in clients table. Added TODO comments about ↵Andrew Manning2018-02-244-15/+29
| | | | | | | | dynamic client registration protocol.
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-2219-159/+162
|\|
| * also sort by id to not make mysql change the queryplan if offset is > 0 ↵Mario Vavti2018-02-221-1/+1
| | | | | | | | after recent index changes
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-2210-81/+50
| |\
| | * remove the unused ZotDriver and ProtoDriver classeszotlabs2018-02-212-49/+0
| | |
| | * move dreport from zot to libzotlabs2018-02-212-5/+5
| | |
| | * move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-orgzotlabs2018-02-215-7/+7
| | |
| | * cleanup the recent crypto code modifications. We need this stuff to be readable.zotlabs2018-02-211-20/+31
| | |
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-211-1/+1
| | |\
| | * | add event resource_id to iconfig so Diaspora can search on it without ↵zotlabs2018-02-211-0/+7
| | | | | | | | | | | | | | | | looking inside JSON objects.
| * | | query for what we need instead of what we do not needMario Vavti2018-02-221-7/+13
| | |/ | |/|
| * | bump versionMario Vavti2018-02-211-1/+1
| |/
| * trim non-existent/deprecated plugins from siteinfo plugin listzotlabs2018-02-202-3/+13
| |
| * Add 'Validate' button to new_channel page and disable submit until ↵zotlabs2018-02-203-13/+27
| | | | | | | | validated. This is to get around the issue that clicking submit without ever focusing and blurring the nickname field won't actually submit the form but only provide validation. It needs to be clicked again to submit. The first click processed the blur but remained on the page with no feedback. If somebody has better workarounds, please provide. The goal is to ensure that the name and the nickname are both validated before we can submit.
| * move the zot6 delivery to zot_fetch where it makes more sense. Exhaustively ↵zotlabs2018-02-202-3/+8
| | | | | | | | hand tested.