aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
* OAuth2 integrationzotlabs2018-04-033-10/+88
* Merge branch 'master' into oauth2zotlabs2018-04-033-4/+8
|\
| * some more work on hubzilla issue #1019zotlabs2018-04-021-1/+5
| * obscurify chatszotlabs2018-04-012-3/+3
* | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2zotlabs2018-03-314-33/+290
|\ \ | |/ |/|
| * Merge branch 'dev' into oauth2Andrew Manning2018-03-3111-30/+35
| |\
| * \ Merge branch 'dev' into oauth2Andrew Manning2018-03-2725-107/+307
| |\ \
| * \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-123-20/+30
| |\ \ \
| * | | | Fixed access_token request bug and returned oauth2-server-php library to unmo...Andrew Manning2018-03-101-7/+8
| * | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-107-11/+102
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-053-11/+37
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-0413-52/+256
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-02-285-8/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-02-263-4/+43
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an a...Andrew Manning2018-02-262-65/+77
| * | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-253-6/+31
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | An authorization token is received, but I had to modify the Request class in ...Andrew Manning2018-02-253-15/+63
| * | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2411-11/+66
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add channel ID to user_id in clients table. Added TODO comments about dynamic...Andrew Manning2018-02-242-12/+26
| * | | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-228-54/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | The authorization step with client registration and authorization code retrie...Andrew Manning2018-02-222-35/+100
| * | | | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-20210-153/+4704
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | OAuth2TestVehicle module can create and delete oauth2 database tables.Andrew Manning2018-02-203-43/+117
| * | | | | | | | | | | | | Created test vehicle module oauth2testAndrew Manning2018-02-181-0/+43
* | | | | | | | | | | | | | 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-301-2/+2
* | | | | | | | | | | | | Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is o...zotlabs2018-03-301-0/+4
* | | | | | | | | | | | | 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-301-1/+1
* | | | | | | | | | | | | display and link issues with quoted tagszotlabs2018-03-291-6/+7
* | | | | | | | | | | | | 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-291-3/+3
* | | | | | | | | | | | | 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-271-1/+9
* | | | | | | | | | | | | don't include the q and PHPSESSID request variables in a redirected rpostzotlabs2018-03-271-1/+3
* | | | | | | | | | | | | Merge branch 'newmemberwidget'zotlabs2018-03-251-11/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | turn newmember widget into a featurezotlabs2018-03-231-11/+1
* | | | | | | | | | | | | preserve existing categories when updating an app from an embed sourcezotlabs2018-03-241-0/+6
* | | | | | | | | | | | | app sellpage not being storedzotlabs2018-03-242-0/+2
* | | | | | | | | | | | | code optimisations and de-duplication on updating parent commented timestampzotlabs2018-03-241-11/+6
* | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-233-8/+67
|\| | | | | | | | | | | |
| * | | | | | | | | | | | make list mode work in cards and articleszotlabs2018-03-223-5/+39
| * | | | | | | | | | | | make alt_pager work for articles/cardszotlabs2018-03-222-6/+29
| * | | | | | | | | | | | hubzilla issue #1013 - comments not displayed in single card/article viewzotlabs2018-03-222-4/+6
* | | | | | | | | | | | | prevent reload loop if somebody lands on /ochannel (without channel_address a...Mario Vavti2018-03-221-0/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Hubzilla issue #1006, fix anonymous comments bump thread before being approved.zotlabs2018-03-211-0/+14
* | | | | | | | | | | | initial support for alternative sort orders on the cloud pages. Can be trigge...zotlabs2018-03-212-1/+23
* | | | | | | | | | | | Add Ochannel module for testing OStatus bad behaviourzotlabs2018-03-211-0/+66
* | | | | | | | | | | | add the social "party" permission rolezotlabs2018-03-201-0/+19