Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3 from redmatrix/dev | mrjive | 2018-04-05 | 48 | -222/+1068 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-05 | 9 | -57/+51 |
| |\ | |||||
| | * | bbcode() - ensure that $options is always an array, as the interface has chan... | zotlabs | 2018-04-04 | 1 | -0/+4 |
| | * | oauth2 dynamic client registration update | zotlabs | 2018-04-04 | 1 | -19/+11 |
| | * | private forum mentions | zotlabs | 2018-04-04 | 3 | -4/+8 |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-04 | 1 | -1/+4 |
| | |\ | |||||
| | * | | allow the profile recrods to be cloned separately | zotlabs | 2018-04-04 | 2 | -2/+3 |
| | * | | allow the link target attribute to be modified in bbcode() from much further ... | zotlabs | 2018-04-04 | 4 | -32/+25 |
| * | | | Merge pull request #1039 from phellmes/doco-feat-add | git-marijus | 2018-04-05 | 7 | -1/+387 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | add basic structure for additional features documentation | phellmes | 2018-04-04 | 7 | -1/+387 |
| | |/ | |||||
| * / | do not use punify() in get_baseurl() due to performance issues | Mario Vavti | 2018-04-04 | 1 | -1/+4 |
| |/ | |||||
| * | disable the oauth2testvehicle completely until it is safe | zotlabs | 2018-04-03 | 1 | -1/+3 |
| * | get rid of dangerous test code | zotlabs | 2018-04-03 | 1 | -68/+0 |
| * | OAuth2 integration | zotlabs | 2018-04-03 | 6 | -11/+195 |
| * | Merge branch 'master' into oauth2 | zotlabs | 2018-04-03 | 9 | -84/+87 |
| |\ | |||||
| | * | community tags: allow signature of either author or owner so that it stands a... | zotlabs | 2018-04-03 | 1 | -1/+1 |
| | * | some more work on hubzilla issue #1019 | zotlabs | 2018-04-02 | 2 | -2/+6 |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-02 | 2 | -6/+6 |
| | |\ | |||||
| | | * | fix missing login/out buttons for medium screensize | Mario Vavti | 2018-04-01 | 2 | -6/+6 |
| | * | | community tagging refactor - we no longer send an edited post/comment to ever... | zotlabs | 2018-04-02 | 1 | -11/+9 |
| | * | | commtag refactor | zotlabs | 2018-04-02 | 1 | -35/+58 |
| | * | | missing year on profile birthday input, some optimisations to stats | zotlabs | 2018-04-02 | 3 | -39/+17 |
| | * | | obscurify chats | zotlabs | 2018-04-01 | 2 | -3/+3 |
| | |/ | |||||
| * | | 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 unmo... | Andrew Manning | 2018-03-10 | 2 | -8/+9 |
| | * | | | | 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 a... | Andrew Manning | 2018-02-26 | 5 | -82/+137 |
| | * | | | | | | | | | 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 |
| | * | | | | | | | | | | 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 dynamic... | Andrew Manning | 2018-02-24 | 4 | -15/+29 |
| | * | | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-22 | 19 | -159/+162 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | The authorization step with client registration and authorization code retrie... | Andrew Manning | 2018-02-22 | 4 | -42/+113 |
| | * | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | 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 |