Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-28 | 5 | -8/+34 |
|\ | |||||
| * | erge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-28 | 2 | -4/+5 |
| |\ | |||||
| | * | rename Addon/Feature settings to addon settings [string change] | zotlabs | 2018-02-27 | 2 | -2/+2 |
| | | | |||||
| | * | provide usage hint on addon settings page to save each panel before opening ↵ | zotlabs | 2018-02-27 | 1 | -0/+1 |
| | | | | | | | | | | | | another. [String change, not for 3.2] | ||||
| | * | move oauth_client management and guest access tokens to features rather than ↵ | zotlabs | 2018-02-27 | 1 | -2/+2 |
| | | | | | | | | | | | | auto-enabling at various feature levels. This involves string changes and should *not* go into 3.2RC. | ||||
| * | | typo | Mario Vavti | 2018-02-28 | 1 | -1/+1 |
| | | | |||||
| * | | missed one index in the last update | Mario Vavti | 2018-02-28 | 1 | -0/+24 |
| | | | |||||
| * | | missed some string for translation - update strings | Mario Vavti | 2018-02-28 | 1 | -3/+3 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-26 | 5 | -9/+51 |
| |\ | |||||
| * | | require directory servers to be using some modern form of encryption; which ↵ | zotlabs | 2018-02-26 | 1 | -1/+2 |
| | | | | | | | | | | | | means we only currently have 2. | ||||
* | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-26 | 3 | -4/+43 |
|\ \ \ | | |/ | |/| | |||||
| * | | fix icon position and make string translatable | Mario Vavti | 2018-02-26 | 1 | -3/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-26 | 1 | -1/+10 |
| |\| | |||||
| | * | provide opt-out link and text with notification emails | zotlabs | 2018-02-25 | 1 | -1/+10 |
| | | | |||||
| * | | another DB upgrade to address some long running maintenance queries | Mario Vavti | 2018-02-26 | 1 | -0/+27 |
| | | | |||||
* | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵ | Andrew Manning | 2018-02-26 | 2 | -65/+77 |
| | | | | | | | | | | | | authenticated API call using an access_token. | ||||
* | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-25 | 3 | -6/+31 |
|\| | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-25 | 1 | -3/+16 |
| |\| | |||||
| | * | make the profile photo image picker work correctly with multiple profiles. | zotlabs | 2018-02-24 | 1 | -3/+16 |
| | | | |||||
| * | | do not overwrite abook flags if we are not owner | Mario Vavti | 2018-02-25 | 1 | -1/+1 |
| | | | |||||
| * | | mark connections where we do not have post_comments permissions with an no ↵ | Mario Vavti | 2018-02-24 | 2 | -2/+14 |
| | | | | | | | | | | | | entry sign. | ||||
* | | | An authorization token is received, but I had to modify the Request class in ↵ | Andrew Manning | 2018-02-25 | 3 | -15/+63 |
| | | | | | | | | | | | | vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST. | ||||
* | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-24 | 11 | -11/+66 |
|\| | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-24 | 8 | -10/+25 |
| |\| | |||||
| | * | open_pubstream logic was messy and wrong | zotlabs | 2018-02-23 | 1 | -1/+7 |
| | | | |||||
| | * | style the 'use existing' button a wee bit | zotlabs | 2018-02-23 | 2 | -2/+2 |
| | | | |||||
| | * | use embed photos javascript widget to select existing photos for profile and ↵ | zotlabs | 2018-02-23 | 4 | -7/+15 |
| | | | | | | | | | | | | cover photos | ||||
| | * | Usability and member experience: remove street address info from the default ↵ | zotlabs | 2018-02-23 | 3 | -2/+3 |
| | | | | | | | | | | | | 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 1204 | Mario Vavti | 2018-02-23 | 1 | -3/+3 |
| |/ | |||||
| * | handle error logging in on cloud page (post method not implemented), ↵ | zotlabs | 2018-02-22 | 1 | -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 ↵ | zotlabs | 2018-02-22 | 1 | -1/+4 |
| | | | | | | | | 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 ↵ | zotlabs | 2018-02-22 | 1 | -0/+34 |
| | | | | | | | | platforms | ||||
* | | Add channel ID to user_id in clients table. Added TODO comments about ↵ | Andrew Manning | 2018-02-24 | 2 | -12/+26 |
| | | | | | | | | dynamic client registration protocol. | ||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-22 | 8 | -54/+6 |
|\| | |||||
| * | also sort by id to not make mysql change the queryplan if offset is > 0 ↵ | Mario Vavti | 2018-02-22 | 1 | -1/+1 |
| | | | | | | | | after recent index changes | ||||
| * | remove the unused ZotDriver and ProtoDriver classes | zotlabs | 2018-02-21 | 2 | -49/+0 |
| | | |||||
| * | move dreport from zot to lib | zotlabs | 2018-02-21 | 1 | -1/+1 |
| | | |||||
| * | move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org | zotlabs | 2018-02-21 | 3 | -3/+3 |
| | | |||||
| * | Add 'Validate' button to new_channel page and disable submit until ↵ | zotlabs | 2018-02-20 | 1 | -0/+1 |
| | | | | | | | | 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. | ||||
* | | The authorization step with client registration and authorization code ↵ | Andrew Manning | 2018-02-22 | 2 | -35/+100 |
| | | | | | | | | retrieval working. Might not conform perfectly to OAuth2 spec, but it is a start. | ||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-20 | 210 | -153/+4704 |
|\| | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-20 | 1 | -1/+1 |
| |\ | |||||
| | * | copy/paste error resulting in bad behaviour | zotlabs | 2018-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | missing file | Mario Vavti | 2018-02-20 | 1 | -0/+29 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-19 | 7 | -62/+84 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-19 | 1 | -1/+15 |
| | |\ | |||||
| | * | | updates 1201 and 1200 should return success for postgres. notifications: ↵ | Mario Vavti | 2018-02-19 | 3 | -8/+16 |
| | | | | | | | | | | | | | | | | remove class show and session storage entry when we mark all notifications seen | ||||
| | * | | Merge pull request #980 from dawnbreak/dev | git-marijus | 2018-02-19 | 3 | -53/+44 |
| | |\ \ | | | | | | | | | | | Refactor OAuth2Server a bit. | ||||
| | | * | | Refactor OAuth2Server a bit. | Klaus Weidenbach | 2018-02-17 | 3 | -53/+44 |
| | | | | | |||||
| | * | | | backport update 1201 to the new update system and move dummy update to 1202 | Mario Vavti | 2018-02-19 | 2 | -5/+28 |
| | | | | |