aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-2/+2
|\
| * don't try to handle OAEP for plugin crypto methods; let them do it if desiredzotlabs2018-02-201-2/+2
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-1/+6
|\|
| * encrypt/decrypt function not foundzotlabs2018-02-201-1/+6
| |
* | remove order by clauseMario Vavti2018-02-201-1/+1
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-192-3/+12
|\
| * do not show summary if it is equal to body and some styling for the ↵Mario Vavti2018-02-192-1/+4
| | | | | | | | summary/article toggle links
| * Merge pull request #981 from anaqreon/devgit-marijus2018-02-191-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 Manning2018-02-181-2/+8
| | | | | | | | | | | | code render nicely.
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-152-4/+2
| | |\
* | | | OAEP padding mismatch on some newer encryption methodszotlabs2018-02-192-9/+7
| | | |
* | | | more loggingzotlabs2018-02-191-0/+1
| | | |
* | | | add loggingzotlabs2018-02-191-0/+2
|/ / /
* | | crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding)zotlabs2018-02-161-5/+22
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-141-3/+13
|\| | | |/ |/|
| * since we only save the parent mid in notify we must look for thr_parent when ↵Mario Vavti2018-02-131-1/+1
| | | | | | | | dealing with likes
| * fix parent id for likes in status notifications.Mario Vavti2018-02-131-2/+12
| |
* | provide option to block the public stream unless authenticated, since there ↵zotlabs2018-02-142-4/+2
|/ | | | could be legal issues with unmoderated content
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-118-339/+74
|\
| * Merge pull request #976 from phellmes/time-ago-stringsgit-marijus2018-02-111-4/+10
| |\ | | | | | | more flexibility for relative date/time translations
| | * add flexibility to prefix/suffix string translations for jquery.timeagophellmes2018-02-111-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 Vavti2018-02-111-1/+1
| |/ | | | | | | this query
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-092-10/+184
| |\
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-081-44/+0
| |\ \
| * | | do not spam the logMario Vavti2018-02-071-1/+1
| | | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-02-075-333/+62
| |\ \ \
| | * \ \ Merge pull request #971 from dawnbreak/QA_testinggit-marijus2018-02-065-333/+62
| | |\ \ \ | | | | | | | | | | | | UnitTests for database classes and bit cleanup and docu
| | | * | | :white_check_mark: Add tests for non existent tables.Klaus Weidenbach2018-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Prevent PHP warnings "Undefined variable" in dba_pdo::q();
| | | * | | :fire: Cleanup old database related files.Klaus Weidenbach2018-01-285-332/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove non used database drivers, remove unused methods. Improve documentation.
* | | | | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous commentszotlabs2018-02-111-1/+1
| | | | | |
* | | | | | purify summaryzotlabs2018-02-111-0/+7
| |_|_|_|/ |/| | | |
* | | | | cosmeticzotlabs2018-02-081-2/+1
| | | | |
* | | | | turn the logs down againzotlabs2018-02-081-2/+1
| | | | |
* | | | | zot6 testingzotlabs2018-02-081-4/+8
| | | | |
* | | | | z6 testingzotlabs2018-02-082-4/+2
| | | | |
* | | | | encrypt the httpsig for zot6 transportzotlabs2018-02-072-4/+24
| | | | |
* | | | | compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is ↵zotlabs2018-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | present
* | | | | zot6 delivery workzotlabs2018-02-071-3/+3
| | | | |
* | | | | more zot6 delivery workzotlabs2018-02-072-11/+89
| | | | |
* | | | | Merge branch 'master' into z6zotlabs2018-02-074-228/+25
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | remove dead codezotlabs2018-02-071-44/+0
| |/ / /
| * / / slight improvement in ostatus protocol detection from xml feedzotlabs2018-02-061-7/+8
| |/ /
| * | code cleanupzotlabs2018-02-051-81/+16
| | |
| * | remove dead codezotlabs2018-02-051-96/+1
| | |
* | | Merge branch 'master' into z6zotlabs2018-02-0520-591/+452
|\| |
| * | feedutils: separate the parsing of author information from the parsing of ↵zotlabs2018-02-051-94/+126
| | | | | | | | | | | | item/activity information
| * | implode can take its arguments in either order, but let's try to be consistentzotlabs2018-02-041-26/+29
| | |
| * | decomplicate cont.zotlabs2018-02-031-0/+60
| | |
| * | provide summaries in feeds under very limited cases, but never in compat ↵zotlabs2018-02-011-3/+19
| | | | | | | | | | | | (GNU-Social) mode
| * | some feed cleanupzotlabs2018-02-011-26/+9
| | |