Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 | zotlabs | 2018-03-31 | 8 | -51/+372 |
|\ | |||||
| * | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-31 | 24 | -50/+99 |
| |\ | |||||
| * \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-27 | 864 | -27843/+50994 |
| |\ \ | |||||
| * \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-12 | 5 | -24/+31 |
| |\ \ \ | |||||
| * | | | | Fixed access_token request bug and returned oauth2-server-php library to ↵ | Andrew Manning | 2018-03-10 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | unmodified state. | ||||
| * | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-10 | 24 | -211/+493 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-05 | 12 | -1486/+1863 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-04 | 93 | -1686/+3030 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-28 | 13 | -202/+305 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-26 | 813 | -140847/+4362 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵ | Andrew Manning | 2018-02-26 | 5 | -82/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticated API call using an access_token. | ||||
| * | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-25 | 14 | -16/+79 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | An authorization token is received, but I had to modify the Request class in ↵ | Andrew Manning | 2018-02-25 | 4 | -16/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST. | ||||
| * | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-24 | 22 | -21/+306 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add channel ID to user_id in clients table. Added TODO comments about ↵ | Andrew Manning | 2018-02-24 | 4 | -15/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic client registration protocol. | ||||
| * | | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-22 | 19 | -159/+162 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | The authorization step with client registration and authorization code ↵ | Andrew Manning | 2018-02-22 | 4 | -42/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieval working. Might not conform perfectly to OAuth2 spec, but it is a start. | ||||
| * | | | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-20 | 219 | -3299/+4755 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | OAuth2TestVehicle module can create and delete oauth2 database tables. | Andrew Manning | 2018-02-20 | 5 | -43/+117 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Created test vehicle module oauth2test | Andrew Manning | 2018-02-18 | 3 | -0/+60 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | wrong function | zotlabs | 2018-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-31 | 6 | -5/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-30 | 6 | -17/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | bump version | Mario Vavti | 2018-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | undo vcard on display module until we can make it accurate | zotlabs | 2018-03-31 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Hubzilla issue #1022 cleanup of post formatting | zotlabs | 2018-03-30 | 1 | -1/+1 |
| |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Hubzilla issue #1022 - improve the usability | zotlabs | 2018-03-30 | 2 | -5/+3 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is ↵ | zotlabs | 2018-03-30 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only implemented in the 'edit' pane and could use some improvement/enhancement | ||||
* | | | | | | | | | | | | | | | hubzilla issue #1020 - PM using unicode domain for recipient. May require ↵ | zotlabs | 2018-03-30 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | further testing | ||||
* | | | | | | | | | | | | | | | allow case independence of replacements as well as patterns | zotlabs | 2018-03-30 | 2 | -2/+2 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | display and link issues with quoted tags | zotlabs | 2018-03-29 | 1 | -6/+7 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | add directory keyword links to profile | zotlabs | 2018-03-29 | 1 | -2/+13 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | directory: link entry keywords to a directory keyword search | zotlabs | 2018-03-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | hubzilla issue #1019 - punycode urls on connedit page when displaying locations | zotlabs | 2018-03-29 | 3 | -7/+10 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | hubzilla issue #1015 - login with unicode domain name | zotlabs | 2018-03-28 | 2 | -3/+5 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | use context method | zotlabs | 2018-03-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | update folder timestamp on uploaded files (fixme - we need to recurse back ↵ | zotlabs | 2018-03-27 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the storage root but that is for another day) | ||||
* | | | | | | | | | | | | | uexport: set content-type to json and add sections info to the default ↵ | zotlabs | 2018-03-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filename if present | ||||
* | | | | | | | | | | | | | put vcard widget with author of top-level post on display page | zotlabs | 2018-03-27 | 3 | -2/+12 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | don't include the q and PHPSESSID request variables in a redirected rpost | zotlabs | 2018-03-27 | 1 | -1/+3 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Hard fail imports of removed channels. This is silly. | zotlabs | 2018-03-27 | 1 | -0/+5 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | IDN: force baseurl to be punycode; for consistency and federation all ↵ | zotlabs | 2018-03-25 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | internal urls are US-ASCII, unicode MAY be used for display. | ||||
* | | | | | | | | | | | | | php strpos() empty needle warning when a term entry has no url | zotlabs | 2018-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-25 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-25 | 4 | -36/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-24 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'newmemberwidget' | zotlabs | 2018-03-25 | 2 | -13/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | testing start_menu feature | zotlabs | 2018-03-25 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | turn newmember widget into a feature | zotlabs | 2018-03-23 | 2 | -12/+10 |
| | | | | | | | | | | | | | | |