| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-25 | 14 | -16/+79 |
|\ |
|
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-25 | 4 | -9/+27 |
| |\ |
|
| | * | siteinfo.json - if hide_in_statistics is set only include the total channels ... | zotlabs | 2018-02-24 | 1 | -4/+7 |
| | * | make the profile photo image picker work correctly with multiple profiles. | zotlabs | 2018-02-24 | 3 | -5/+20 |
| * | | do not overwrite abook flags if we are not owner | Mario Vavti | 2018-02-25 | 1 | -1/+1 |
| * | | mark connections where we do not have post_comments permissions with an no en... | Mario Vavti | 2018-02-24 | 10 | -6/+51 |
* | | | 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 |
|\| | |
|
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-24 | 14 | -17/+246 |
| |\| |
|
| | * | open_pubstream logic was messy and wrong | zotlabs | 2018-02-23 | 1 | -1/+7 |
| | * | style the buttons even more | zotlabs | 2018-02-23 | 2 | -4/+4 |
| | * | style the 'use existing' button a wee bit | zotlabs | 2018-02-23 | 4 | -6/+4 |
| | * | use embed photos javascript widget to select existing photos for profile and ... | zotlabs | 2018-02-23 | 8 | -10/+233 |
| | * | usability: click your own profile photo to change it instead of hunting it do... | zotlabs | 2018-02-23 | 2 | -1/+2 |
| | * | Usability and member experience: remove street address info from the default ... | zotlabs | 2018-02-23 | 4 | -4/+5 |
| * | | fix issues with DB update 1204 | Mario Vavti | 2018-02-23 | 1 | -3/+3 |
| |/ |
|
| * | mod_new_channel: don't require nickname validation after name validation (whi... | zotlabs | 2018-02-22 | 1 | -0/+3 |
| * | handle error logging in on cloud page (post method not implemented), politely... | zotlabs | 2018-02-22 | 1 | -0/+3 |
| * | cloud 'view-as-tiles' toggle wasn't available (at all) for guests and they ar... | zotlabs | 2018-02-22 | 2 | -3/+7 |
| * | provide DB compatibility for poll and voting implementations across several p... | zotlabs | 2018-02-22 | 4 | -1/+47 |
* | | 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 |
|\| |
|
| * | also sort by id to not make mysql change the queryplan if offset is > 0 after... | Mario Vavti | 2018-02-22 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-22 | 10 | -81/+50 |
| |\ |
|
| | * | remove the unused ZotDriver and ProtoDriver classes | zotlabs | 2018-02-21 | 2 | -49/+0 |
| | * | move dreport from zot to lib | zotlabs | 2018-02-21 | 2 | -5/+5 |
| | * | move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org | zotlabs | 2018-02-21 | 5 | -7/+7 |
| | * | cleanup the recent crypto code modifications. We need this stuff to be readable. | zotlabs | 2018-02-21 | 1 | -20/+31 |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-21 | 1 | -1/+1 |
| | |\ |
|
| | * | | add event resource_id to iconfig so Diaspora can search on it without looking... | zotlabs | 2018-02-21 | 1 | -0/+7 |
| * | | | query for what we need instead of what we do not need | Mario Vavti | 2018-02-22 | 1 | -7/+13 |
| | |/
| |/| |
|
| * | | bump version | Mario Vavti | 2018-02-21 | 1 | -1/+1 |
| |/ |
|
| * | trim non-existent/deprecated plugins from siteinfo plugin list | zotlabs | 2018-02-20 | 2 | -3/+13 |
| * | Add 'Validate' button to new_channel page and disable submit until validated.... | zotlabs | 2018-02-20 | 3 | -13/+27 |
| * | move the zot6 delivery to zot_fetch where it makes more sense. Exhaustively h... | zotlabs | 2018-02-20 | 2 | -3/+8 |
| * | zot6 delivery cleanup | zotlabs | 2018-02-20 | 1 | -50/+49 |
* | | 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 |
|\| |
|
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-20 | 2 | -3/+3 |
| |\ |
|
| | * | copy/paste error resulting in bad behaviour | zotlabs | 2018-02-20 | 1 | -1/+1 |
| | * | don't try to handle OAEP for plugin crypto methods; let them do it if desired | zotlabs | 2018-02-20 | 1 | -2/+2 |
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-20 | 1 | -1/+6 |
| |\| |
|
| | * | encrypt/decrypt function not found | zotlabs | 2018-02-20 | 1 | -1/+6 |
| * | | remove order by clause | Mario Vavti | 2018-02-20 | 1 | -1/+1 |
| * | | missing file | Mario Vavti | 2018-02-20 | 1 | -0/+29 |
| * | | more index finetuning to fix the expire query | Mario Vavti | 2018-02-20 | 2 | -5/+5 |
| |/ |
|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-19 | 12 | -66/+128 |
| |\ |
|
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-19 | 1 | -1/+15 |
| | |\ |
|
| | * | | updates 1201 and 1200 should return success for postgres. notifications: remo... | Mario Vavti | 2018-02-19 | 4 | -8/+18 |
| | * | | do not show summary if it is equal to body and some styling for the summary/a... | Mario Vavti | 2018-02-19 | 3 | -2/+13 |