Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-20 | 1 | -2/+2 |
|\ | |||||
| * | 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 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-19 | 2 | -3/+12 |
|\ | |||||
| * | do not show summary if it is equal to body and some styling for the ↵ | Mario Vavti | 2018-02-19 | 2 | -1/+4 |
| | | | | | | | | summary/article toggle links | ||||
| * | Merge pull request #981 from anaqreon/dev | git-marijus | 2018-02-19 | 1 | -2/+8 |
| |\ | | | | | | | Update code tag styling so bbcode [code] blocks and wiki markdown ... | ||||
| | * | Update code tag styling so bbcode [code] blocks and wiki markdown inline ↵ | Andrew Manning | 2018-02-18 | 1 | -2/+8 |
| | | | | | | | | | | | | code render nicely. | ||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-15 | 2 | -4/+2 |
| | |\ | |||||
* | | | | 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 |
|/ / / | |||||
* | | | 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-14 | 1 | -3/+13 |
|\| | | |/ |/| | |||||
| * | since we only save the parent mid in notify we must look for thr_parent when ↵ | Mario Vavti | 2018-02-13 | 1 | -1/+1 |
| | | | | | | | | dealing with likes | ||||
| * | 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 ↵ | zotlabs | 2018-02-14 | 2 | -4/+2 |
|/ | | | | could be legal issues with unmoderated content | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-11 | 8 | -339/+74 |
|\ | |||||
| * | Merge pull request #976 from phellmes/time-ago-strings | git-marijus | 2018-02-11 | 1 | -4/+10 |
| |\ | | | | | | | more flexibility for relative date/time translations | ||||
| | * | add flexibility to prefix/suffix string translations for jquery.timeago | phellmes | 2018-02-11 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | In addition to use the defaults or any other translated strings this allows now to force an empty string by setting the translation to NONE. Translators can choose to either use prefixes only, suffixes only, none of them or both of them - whatever sounds best in their language. | ||||
| * | | this might seem rediculous but it helps mysql to find the better index for ↵ | Mario Vavti | 2018-02-11 | 1 | -1/+1 |
| |/ | | | | | | | this query | ||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-09 | 2 | -10/+184 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-08 | 1 | -44/+0 |
| |\ \ | |||||
| * | | | do not spam the log | Mario Vavti | 2018-02-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-02-07 | 5 | -333/+62 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #971 from dawnbreak/QA_testing | git-marijus | 2018-02-06 | 5 | -333/+62 |
| | |\ \ \ | | | | | | | | | | | | | UnitTests for database classes and bit cleanup and docu | ||||
| | | * | | | :white_check_mark: Add tests for non existent tables. | Klaus Weidenbach | 2018-01-28 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Prevent PHP warnings "Undefined variable" in dba_pdo::q(); | ||||
| | | * | | | :fire: Cleanup old database related files. | Klaus Weidenbach | 2018-01-28 | 5 | -332/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove non used database drivers, remove unused methods. Improve documentation. | ||||
* | | | | | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments | zotlabs | 2018-02-11 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | purify summary | zotlabs | 2018-02-11 | 1 | -0/+7 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | cosmetic | zotlabs | 2018-02-08 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | turn the logs down again | zotlabs | 2018-02-08 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | zot6 testing | zotlabs | 2018-02-08 | 1 | -4/+8 |
| | | | | | |||||
* | | | | | z6 testing | zotlabs | 2018-02-08 | 2 | -4/+2 |
| | | | | | |||||
* | | | | | encrypt the httpsig for zot6 transport | zotlabs | 2018-02-07 | 2 | -4/+24 |
| | | | | | |||||
* | | | | | compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is ↵ | zotlabs | 2018-02-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | present | ||||
* | | | | | zot6 delivery work | zotlabs | 2018-02-07 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | more zot6 delivery work | zotlabs | 2018-02-07 | 2 | -11/+89 |
| | | | | | |||||
* | | | | | Merge branch 'master' into z6 | zotlabs | 2018-02-07 | 4 | -228/+25 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | remove dead code | zotlabs | 2018-02-07 | 1 | -44/+0 |
| |/ / / | |||||
| * / / | slight improvement in ostatus protocol detection from xml feed | zotlabs | 2018-02-06 | 1 | -7/+8 |
| |/ / | |||||
| * | | code cleanup | zotlabs | 2018-02-05 | 1 | -81/+16 |
| | | | |||||
| * | | remove dead code | zotlabs | 2018-02-05 | 1 | -96/+1 |
| | | | |||||
* | | | Merge branch 'master' into z6 | zotlabs | 2018-02-05 | 20 | -591/+452 |
|\| | | |||||
| * | | feedutils: separate the parsing of author information from the parsing of ↵ | zotlabs | 2018-02-05 | 1 | -94/+126 |
| | | | | | | | | | | | | item/activity information | ||||
| * | | implode can take its arguments in either order, but let's try to be consistent | zotlabs | 2018-02-04 | 1 | -26/+29 |
| | | | |||||
| * | | decomplicate cont. | zotlabs | 2018-02-03 | 1 | -0/+60 |
| | | | |||||
| * | | provide summaries in feeds under very limited cases, but never in compat ↵ | zotlabs | 2018-02-01 | 1 | -3/+19 |
| | | | | | | | | | | | | (GNU-Social) mode | ||||
| * | | some feed cleanup | zotlabs | 2018-02-01 | 1 | -26/+9 |
| | | |