| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-24 | 9 | -10/+28 |
|\ |
|
| * | open_pubstream logic was messy and wrong | zotlabs | 2018-02-23 | 1 | -1/+7 |
| * | style the 'use existing' button a wee bit | zotlabs | 2018-02-23 | 2 | -2/+2 |
| * | use embed photos javascript widget to select existing photos for profile and ... | zotlabs | 2018-02-23 | 4 | -7/+15 |
| * | Usability and member experience: remove street address info from the default ... | zotlabs | 2018-02-23 | 3 | -2/+3 |
| * | handle error logging in on cloud page (post method not implemented), politely... | zotlabs | 2018-02-22 | 1 | -0/+3 |
* | | Add channel ID to user_id in clients table. Added TODO comments about dynamic... | Andrew Manning | 2018-02-24 | 2 | -12/+26 |
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-22 | 4 | -3/+4 |
|\| |
|
| * | also sort by id to not make mysql change the queryplan if offset is > 0 after... | Mario Vavti | 2018-02-22 | 1 | -1/+1 |
| * | move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org | zotlabs | 2018-02-21 | 2 | -2/+2 |
| * | Add 'Validate' button to new_channel page and disable submit until validated.... | zotlabs | 2018-02-20 | 1 | -0/+1 |
* | | The authorization step with client registration and authorization code retrie... | Andrew Manning | 2018-02-22 | 2 | -35/+100 |
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-20 | 3 | -52/+56 |
|\| |
|
| * | Merge pull request #980 from dawnbreak/dev | git-marijus | 2018-02-19 | 2 | -27/+27 |
| |\ |
|
| | * | Refactor OAuth2Server a bit. | Klaus Weidenbach | 2018-02-17 | 2 | -27/+27 |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-16 | 2 | -7/+7 |
| |\| |
|
| * | | refactor of the DB update system. Updates are now stored individually in Zotl... | zotlabs | 2018-02-16 | 1 | -25/+29 |
* | | | OAuth2TestVehicle module can create and delete oauth2 database tables. | Andrew Manning | 2018-02-20 | 2 | -43/+107 |
* | | | Created test vehicle module oauth2test | Andrew Manning | 2018-02-18 | 1 | -0/+43 |
| |/
|/| |
|
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-16 | 2 | -54/+47 |
|\| |
|
| * | extend the oauth2 storage driver so that we can use our own channel table | zotlabs | 2018-02-15 | 2 | -54/+47 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-14 | 1 | -1/+12 |
| |\ |
|
* | | | some more DB tuning. | Mario Vavti | 2018-02-15 | 2 | -7/+7 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-15 | 2 | -5/+6 |
|\| |
| |/
|/| |
|
| * | provide option to block the public stream unless authenticated, since there c... | zotlabs | 2018-02-14 | 2 | -5/+6 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-14 | 3 | -2/+21 |
|\| |
|
| * | Merge branch 'share' | zotlabs | 2018-02-13 | 2 | -1/+20 |
| |\ |
|
| | * | turn shares into activities - make certain to pull addons or JSON-LD will chu... | zotlabs | 2018-02-13 | 2 | -4/+8 |
| | * | initial share refactor | zotlabs | 2018-02-12 | 1 | -1/+16 |
| * | | defperms: bad query | zotlabs | 2018-02-13 | 1 | -1/+1 |
| |/ |
|
* / | since we only save the parent mid in notify we must look for thr_parent when ... | Mario Vavti | 2018-02-13 | 1 | -1/+12 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-11 | 2 | -20/+20 |
|\ |
|
| * | finally fix channel query | Mario Vavti | 2018-02-09 | 1 | -4/+4 |
| * | use distinct in channel item query and minor notification cache improvement | Mario Vavti | 2018-02-09 | 1 | -5/+5 |
| * | more db and queries finetuning | Mario Vavti | 2018-02-08 | 1 | -13/+13 |
* | | second part of hubzilla issue #972 | zotlabs | 2018-02-11 | 1 | -5/+4 |
* | | use new forum tag style in forum search postings | zotlabs | 2018-02-11 | 1 | -1/+1 |
* | | hubzilla issue #975 (searching for title as well as body could present a perf... | zotlabs | 2018-02-09 | 1 | -1/+1 |
|/ |
|
* | remove mobile_detect (outdated and unmaintainable) | zotlabs | 2018-02-05 | 3 | -24/+5 |
* | implode can take its arguments in either order, but let's try to be consistent | zotlabs | 2018-02-04 | 1 | -6/+6 |
* | this will fix the cards query and keep the rest intact | Mario Vavti | 2018-02-04 | 1 | -1/+1 |
* | remove some never used indices which prevented our item queries to find the r... | Mario Vavti | 2018-02-04 | 5 | -32/+37 |
* | some feed cleanup | zotlabs | 2018-02-01 | 1 | -8/+9 |
* | more separation of complex code into separate functions | zotlabs | 2018-02-01 | 1 | -20/+3 |
* | remove logging | zotlabs | 2018-01-29 | 1 | -2/+0 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-29 | 1 | -38/+41 |
|\ |
|
| * | Fix a PHP7.2 warning when a channel has no cards. | Klaus Weidenbach | 2018-01-28 | 1 | -38/+41 |
* | | unable to delete accounts using tickboxes on admin/accounts - make all the ac... | zotlabs | 2018-01-29 | 1 | -3/+6 |
* | | redirect to the email_validation page if login was attempted after account cr... | zotlabs | 2018-01-29 | 1 | -0/+1 |
* | | fix workflow for form based email validation when auto_channel_create is in e... | zotlabs | 2018-01-29 | 1 | -0/+9 |