Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | | | | | | | | 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 | 8 | -12/+41 |
| |/ |/| | | | | | could be legal issues with unmoderated content | ||||
* | | Merge branch 'share' | zotlabs | 2018-02-13 | 3 | -1/+161 |
|\ \ | |||||
| * | | turn shares into activities - make certain to pull addons or JSON-LD will ↵ | zotlabs | 2018-02-13 | 3 | -4/+149 |
| | | | | | | | | | | | | chuck a wobbly | ||||
| * | | 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 |
| | | | | in php7.2. Since magic quotes themselves have been deprecated as a default condition for several years, the cleaning of globals should no longer be required and was also removed. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-11 | 25 | -405/+516 |
|\ | |||||
| * | Merge pull request #976 from phellmes/time-ago-strings | git-marijus | 2018-02-11 | 3 | -34/+40 |
| |\ | | | | | | | more flexibility for relative date/time translations | ||||
| | * | update DE translation strings for new relative date/time options | phellmes | 2018-02-11 | 2 | -30/+30 |
| | | | | | | | | | | | | | | | temporary manual string update in relation to last commit until changes reach Transifex and can be updated there | ||||
| | * | 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 | ||||
| * | 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 | 2 | -5/+7 |
| | | |||||
| * | bump version | Mario Vavti | 2018-02-09 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-09 | 4 | -15/+204 |
| |\ | |||||
| * | | wrong link | Mario Vavti | 2018-02-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-08 | 1 | -44/+0 |
| |\ \ | |||||
| * | | | more db and queries finetuning | Mario Vavti | 2018-02-08 | 4 | -18/+32 |
| | | | | |||||
| * | | | 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 | 13 | -343/+432 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #971 from dawnbreak/QA_testing | git-marijus | 2018-02-06 | 13 | -343/+432 |
| | |\ \ \ | | | | | | | | | | | | | UnitTests for database classes and bit cleanup and docu | ||||
| | | * | | | Make it little bit less likely to erase a real database. | Klaus Weidenbach | 2018-01-29 | 4 | -21/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the default PHPUnit database environment variables to make it little bit less likely to truncate accidently a real database. | ||||
| | | * | | | :white_check_mark: Add tests for non existent tables. | Klaus Weidenbach | 2018-01-28 | 2 | -1/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | * | | | :white_check_mark: Unit Test for dba_pdo driver class. | Klaus Weidenbach | 2018-01-28 | 7 | -4/+273 |
| | | | | | | |||||
| | | * | | | :white_check_mark: Unit Test for \DBA factory. | Klaus Weidenbach | 2018-01-28 | 1 | -0/+67 |
| | | | | | | |||||
* | | | | | | second part of hubzilla issue #972 | zotlabs | 2018-02-11 | 1 | -5/+4 |
| | | | | | | |||||
* | | | | | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments | zotlabs | 2018-02-11 | 2 | -2/+4 |
| | | | | | | |||||
* | | | | | | use new forum tag style in forum search postings | zotlabs | 2018-02-11 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | purify summary | zotlabs | 2018-02-11 | 1 | -0/+7 |
| | | | | | | |||||
* | | | | | | hubzilla issue #975 (searching for title as well as body could present a ↵ | zotlabs | 2018-02-09 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | performance issue, so perhaps the tradeoffs should be debated) | ||||
* | | | | | 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 | 2 | -10/+9 |
| | | | | | |||||
* | | | | | missing quote | zotlabs | 2018-02-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | logging | zotlabs | 2018-02-08 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | z6 testing | zotlabs | 2018-02-08 | 3 | -5/+3 |
| | | | | | |||||
* | | | | | debug the crypto function | zotlabs | 2018-02-07 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | 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 |
| | | | | |