| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | 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 |
| * | | 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 inline code... | Andrew Manning | 2018-02-18 | 2 | -2/+29 |
| * | | | Merge pull request #980 from dawnbreak/dev | git-marijus | 2018-02-19 | 3 | -53/+44 |
| |\ \ \ |
|
| | * | | | 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 precise... | zotlabs | 2018-02-19 | 1 | -1/+15 |
|/ / |
|
* | | 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 |
|\| |
|
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-16 | 4 | -54/+171 |
| |\ |
|
| * | | bump version | Mario Vavti | 2018-02-15 | 1 | -1/+1 |
| * | | some more DB tuning. | Mario Vavti | 2018-02-15 | 5 | -11/+29 |
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-15 | 8 | -12/+41 |
| |\ \ |
|
* | | | | refactor of the DB update system. Updates are now stored individually in Zotl... | zotlabs | 2018-02-16 | 205 | -3214/+4585 |
| |_|/
|/| | |
|
* | | | 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 |
|\| |
| |/
|/| |
|
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-14 | 4 | -2/+162 |
| |\ |
|
| * | | fix item link in fsprint | Mario Vavti | 2018-02-13 | 1 | -1/+1 |
| * | | match against item verb | Mario Vavti | 2018-02-13 | 1 | -4/+4 |
| * | | since we only save the parent mid in notify we must look for thr_parent when ... | Mario Vavti | 2018-02-13 | 2 | -2/+13 |
| * | | fix parent id for likes in status notifications. | Mario Vavti | 2018-02-13 | 1 | -2/+12 |
* | | | provide option to block the public stream unless authenticated, since there c... | zotlabs | 2018-02-14 | 8 | -12/+41 |
| |/
|/| |
|
* | | Merge branch 'share' | zotlabs | 2018-02-13 | 3 | -1/+161 |
|\ \ |
|
| * | | turn shares into activities - make certain to pull addons or JSON-LD will chu... | zotlabs | 2018-02-13 | 3 | -4/+149 |
| * | | initial share refactor | zotlabs | 2018-02-12 | 1 | -1/+16 |
| |/ |
|
* / | defperms: bad query | zotlabs | 2018-02-13 | 1 | -1/+1 |
|/ |
|
* | if always_show_in_notices is set to 1 also show likes and dislikes | Mario Vavti | 2018-02-12 | 1 | -15/+28 |
* | slightly improve cropper style | Mario Vavti | 2018-02-12 | 3 | -11/+14 |
* | fix issue with new cropping lib and whitespace | Mario Vavti | 2018-02-12 | 2 | -24/+22 |
* | the 'each' function (used in startup() to revert magic quotes) is deprecated ... | zotlabs | 2018-02-11 | 1 | -23/+0 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-11 | 25 | -405/+516 |
|\ |
|