Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ↵ | Mario Vavti | 2018-02-22 | 1 | -1/+1 |
| | | | | | | | | after recent index changes | ||||
| * | 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 ↵ | zotlabs | 2018-02-21 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | looking inside JSON objects. | ||||
| * | | | 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 ↵ | zotlabs | 2018-02-20 | 3 | -13/+27 |
| | | | | | | | | validated. This is to get around the issue that clicking submit without ever focusing and blurring the nickname field won't actually submit the form but only provide validation. It needs to be clicked again to submit. The first click processed the blur but remained on the page with no feedback. If somebody has better workarounds, please provide. The goal is to ensure that the name and the nickname are both validated before we can submit. | ||||
| * | move the zot6 delivery to zot_fetch where it makes more sense. Exhaustively ↵ | zotlabs | 2018-02-20 | 2 | -3/+8 |
| | | | | | | | | hand tested. | ||||
| * | zot6 delivery cleanup | zotlabs | 2018-02-20 | 1 | -50/+49 |
| | | |||||
* | | The authorization step with client registration and authorization code ↵ | Andrew Manning | 2018-02-22 | 4 | -42/+113 |
| | | | | | | | | retrieval working. Might not conform perfectly to OAuth2 spec, but it is a start. | ||||
* | | 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: ↵ | Mario Vavti | 2018-02-19 | 4 | -8/+18 |
| | | | | | | | | | | | | | | | | remove class show and session storage entry when we mark all notifications seen | ||||
| | * | | do not show summary if it is equal to body and some styling for the ↵ | Mario Vavti | 2018-02-19 | 3 | -2/+13 |
| | | | | | | | | | | | | | | | | summary/article toggle links | ||||
| | * | | Merge pull request #981 from anaqreon/dev | git-marijus | 2018-02-19 | 2 | -2/+29 |
| | |\ \ | | | | | | | | | | | Update code tag styling so bbcode [code] blocks and wiki markdown ... | ||||
| | * \ \ | Merge pull request #980 from dawnbreak/dev | git-marijus | 2018-02-19 | 3 | -53/+44 |
| | |\ \ \ | | | | | | | | | | | | | Refactor OAuth2Server a bit. | ||||
| | | * | | | Refactor OAuth2Server a bit. | Klaus Weidenbach | 2018-02-17 | 3 | -53/+44 |
| | | | | | | |||||
| | * | | | | backport update 1201 to the new update system and move dummy update to 1202 | Mario Vavti | 2018-02-19 | 2 | -5/+28 |
| | | | | | | |||||
| * | | | | | OAEP padding mismatch on some newer encryption methods | zotlabs | 2018-02-19 | 2 | -9/+7 |
| | | | | | | |||||
| * | | | | | more logging | zotlabs | 2018-02-19 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | add logging | zotlabs | 2018-02-19 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | and fix the typo | zotlabs | 2018-02-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix the fix for precision | zotlabs | 2018-02-19 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
| * | | | | target zot6 deliveries with more precision to ensure we handle a very ↵ | zotlabs | 2018-02-19 | 1 | -1/+15 |
| |/ / / | | | | | | | | | | | | | precise type of content until the mechanism is extended to other types in the future | ||||
| * | | | crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding) | zotlabs | 2018-02-16 | 1 | -5/+22 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-16 | 4 | -11/+13 |
| |\| | | |||||
| * | | | refactor of the DB update system. Updates are now stored individually in ↵ | zotlabs | 2018-02-16 | 205 | -3214/+4585 |
| | | | | | | | | | | | | | | | | Zotlabs/Update/_nnnn.php and are objects; so only the pending updates need to be loaded and executed rather than all historical updates. There is one single number (DB_UPDATE_VERSION) representing the current version and it is EQUAL TO the last known update. A dummy update _1201 was created to address the difference in counting behaviour; it will be executed on the next change of DB_UPDATE_VERSION as well as the next update. The database config values are also loaded from disk on every update immediately before setting the update lock in order to reduce timing conflicts and race conditions. | ||||
* | | | | 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 |
| |_|/ |/| | | |||||
* | | | Update code tag styling so bbcode [code] blocks and wiki markdown inline ↵ | Andrew Manning | 2018-02-18 | 2 | -2/+29 |
| |/ |/| | | | | | code render nicely. | ||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-16 | 4 | -54/+171 |
|\| | |||||
| * | extend the oauth2 storage driver so that we can use our own channel table | zotlabs | 2018-02-15 | 4 | -54/+171 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-14 | 3 | -9/+30 |
| |\ | |||||
* | | | bump version | Mario Vavti | 2018-02-15 | 1 | -1/+1 |
| | | | |||||
* | | | some more DB tuning. | Mario Vavti | 2018-02-15 | 5 | -11/+29 |
| | | |