aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2zotlabs2018-03-318-51/+372
|\
| * Merge branch 'dev' into oauth2Andrew Manning2018-03-3124-50/+99
| |\
| * \ Merge branch 'dev' into oauth2Andrew Manning2018-03-27864-27843/+50994
| |\ \
| * \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-125-24/+31
| |\ \ \
| * | | | Fixed access_token request bug and returned oauth2-server-php library to unmo...Andrew Manning2018-03-102-8/+9
| * | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-1024-211/+493
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-0512-1486/+1863
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-0493-1686/+3030
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-02-2813-202/+305
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-02-26813-140847/+4362
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add channel ID to user_id in clients table. Added TODO comments about dynamic...Andrew Manning2018-02-244-15/+29
| * | | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2219-159/+162
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | The authorization step with client registration and authorization code retrie...Andrew Manning2018-02-224-42/+113
| * | | | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-20219-3299/+4755
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | OAuth2TestVehicle module can create and delete oauth2 database tables.Andrew Manning2018-02-205-43/+117
| * | | | | | | | | | | | | Created test vehicle module oauth2testAndrew Manning2018-02-183-0/+60
* | | | | | | | | | | | | | wrong functionzotlabs2018-03-311-1/+1
* | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-316-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-306-17/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | bump versionMario Vavti2018-03-291-1/+1
* | | | | | | | | | | | | | | | undo vcard on display module until we can make it accuratezotlabs2018-03-311-1/+2
* | | | | | | | | | | | | | | | Hubzilla issue #1022 cleanup of post formattingzotlabs2018-03-301-1/+1
| |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Hubzilla issue #1022 - improve the usabilityzotlabs2018-03-302-5/+3
* | | | | | | | | | | | | | | Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is o...zotlabs2018-03-302-0/+7
* | | | | | | | | | | | | | | hubzilla issue #1020 - PM using unicode domain for recipient. May require fur...zotlabs2018-03-302-3/+3
* | | | | | | | | | | | | | | allow case independence of replacements as well as patternszotlabs2018-03-302-2/+2
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | display and link issues with quoted tagszotlabs2018-03-291-6/+7
* | | | | | | | | | | | | | add directory keyword links to profilezotlabs2018-03-291-2/+13
* | | | | | | | | | | | | | directory: link entry keywords to a directory keyword searchzotlabs2018-03-291-2/+2
* | | | | | | | | | | | | | hubzilla issue #1019 - punycode urls on connedit page when displaying locationszotlabs2018-03-293-7/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | hubzilla issue #1015 - login with unicode domain namezotlabs2018-03-282-3/+5
* | | | | | | | | | | | | use context methodzotlabs2018-03-281-0/+1
* | | | | | | | | | | | | update folder timestamp on uploaded files (fixme - we need to recurse back to...zotlabs2018-03-271-0/+10
* | | | | | | | | | | | | uexport: set content-type to json and add sections info to the default filena...zotlabs2018-03-271-2/+2
* | | | | | | | | | | | | put vcard widget with author of top-level post on display pagezotlabs2018-03-273-2/+12
* | | | | | | | | | | | | don't include the q and PHPSESSID request variables in a redirected rpostzotlabs2018-03-271-1/+3
* | | | | | | | | | | | | Hard fail imports of removed channels. This is silly.zotlabs2018-03-271-0/+5
* | | | | | | | | | | | | IDN: force baseurl to be punycode; for consistency and federation all interna...zotlabs2018-03-251-5/+5
* | | | | | | | | | | | | php strpos() empty needle warning when a term entry has no urlzotlabs2018-03-251-1/+1
* | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-254-36/+45
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-241-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'newmemberwidget'zotlabs2018-03-252-13/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | testing start_menu featurezotlabs2018-03-251-2/+3
| * | | | | | | | | | | | | | turn newmember widget into a featurezotlabs2018-03-232-12/+10