aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use profile_store_lowlevel() when importing profile structures to ensure all ...zotlabs2018-04-052-5/+8
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-057-1/+387
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-059-57/+51
| |\
| * \ Merge pull request #1039 from phellmes/doco-feat-addgit-marijus2018-04-057-1/+387
| |\ \
| | * | add basic structure for additional features documentationphellmes2018-04-047-1/+387
* | | | fix permalinks to children of articles and cardszotlabs2018-04-054-3/+6
| |_|/ |/| |
* | | bbcode() - ensure that $options is always an array, as the interface has chan...zotlabs2018-04-041-0/+4
* | | oauth2 dynamic client registration updatezotlabs2018-04-041-19/+11
* | | private forum mentionszotlabs2018-04-043-4/+8
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-041-1/+4
|\| |
| * | do not use punify() in get_baseurl() due to performance issuesMario Vavti2018-04-041-1/+4
| |/
* | allow the profile recrods to be cloned separatelyzotlabs2018-04-042-2/+3
* | allow the link target attribute to be modified in bbcode() from much further ...zotlabs2018-04-044-32/+25
|/
* disable the oauth2testvehicle completely until it is safezotlabs2018-04-031-1/+3
* get rid of dangerous test codezotlabs2018-04-031-68/+0
* OAuth2 integrationzotlabs2018-04-036-11/+195
* Merge branch 'master' into oauth2zotlabs2018-04-039-84/+87
|\
| * community tags: allow signature of either author or owner so that it stands a...zotlabs2018-04-031-1/+1
| * some more work on hubzilla issue #1019zotlabs2018-04-022-2/+6
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-022-6/+6
| |\
| | * fix missing login/out buttons for medium screensizeMario Vavti2018-04-012-6/+6
| * | community tagging refactor - we no longer send an edited post/comment to ever...zotlabs2018-04-021-11/+9
| * | commtag refactorzotlabs2018-04-021-35/+58
| * | missing year on profile birthday input, some optimisations to statszotlabs2018-04-023-39/+17
| * | obscurify chatszotlabs2018-04-012-3/+3
| |/
* | 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