aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-143-9/+30
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-144-2/+162
| |\
| * | fix item link in fsprintMario Vavti2018-02-131-1/+1
| | |
| * | match against item verbMario Vavti2018-02-131-4/+4
| | |
| * | since we only save the parent mid in notify we must look for thr_parent when ↵Mario Vavti2018-02-132-2/+13
| | | | | | | | | | | | 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-148-12/+41
| |/ |/| | | | | could be legal issues with unmoderated content
* | Merge branch 'share'zotlabs2018-02-133-1/+161
|\ \
| * | turn shares into activities - make certain to pull addons or JSON-LD will ↵zotlabs2018-02-133-4/+149
| | | | | | | | | | | | chuck a wobbly
| * | initial share refactorzotlabs2018-02-121-1/+16
| |/
* / defperms: bad queryzotlabs2018-02-131-1/+1
|/
* if always_show_in_notices is set to 1 also show likes and dislikesMario Vavti2018-02-121-15/+28
|
* slightly improve cropper styleMario Vavti2018-02-123-11/+14
|
* fix issue with new cropping lib and whitespaceMario Vavti2018-02-122-24/+22
|
* the 'each' function (used in startup() to revert magic quotes) is deprecated ↵zotlabs2018-02-111-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_mergezotlabs2018-02-1125-405/+516
|\
| * Merge pull request #976 from phellmes/time-ago-stringsgit-marijus2018-02-113-34/+40
| |\ | | | | | | more flexibility for relative date/time translations
| | * update DE translation strings for new relative date/time optionsphellmes2018-02-112-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.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
| * finally fix channel queryMario Vavti2018-02-091-4/+4
| |
| * use distinct in channel item query and minor notification cache improvementMario Vavti2018-02-092-5/+7
| |
| * bump versionMario Vavti2018-02-091-1/+1
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-094-15/+204
| |\
| * | wrong linkMario Vavti2018-02-081-1/+1
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-081-44/+0
| |\ \
| * | | more db and queries finetuningMario Vavti2018-02-084-18/+32
| | | |
| * | | do not spam the logMario Vavti2018-02-071-1/+1
| | | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-02-0713-343/+432
| |\ \ \
| | * \ \ Merge pull request #971 from dawnbreak/QA_testinggit-marijus2018-02-0613-343/+432
| | |\ \ \ | | | | | | | | | | | | UnitTests for database classes and bit cleanup and docu
| | | * | | Make it little bit less likely to erase a real database.Klaus Weidenbach2018-01-294-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 Weidenbach2018-01-282-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | :white_check_mark: Unit Test for dba_pdo driver class.Klaus Weidenbach2018-01-287-4/+273
| | | | | |
| | | * | | :white_check_mark: Unit Test for \DBA factory.Klaus Weidenbach2018-01-281-0/+67
| | | | | |
* | | | | | second part of hubzilla issue #972zotlabs2018-02-111-5/+4
| | | | | |
* | | | | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous commentszotlabs2018-02-112-2/+4
| | | | | |
* | | | | | use new forum tag style in forum search postingszotlabs2018-02-111-1/+1
| | | | | |
* | | | | | purify summaryzotlabs2018-02-111-0/+7
| | | | | |
* | | | | | hubzilla issue #975 (searching for title as well as body could present a ↵zotlabs2018-02-091-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | performance issue, so perhaps the tradeoffs should be debated)
* | | | | cosmeticzotlabs2018-02-081-2/+1
| | | | |
* | | | | turn the logs down againzotlabs2018-02-081-2/+1
| | | | |
* | | | | zot6 testingzotlabs2018-02-082-10/+9
| | | | |
* | | | | missing quotezotlabs2018-02-081-1/+1
| | | | |
* | | | | loggingzotlabs2018-02-081-1/+3
| | | | |
* | | | | z6 testingzotlabs2018-02-083-5/+3
| | | | |
* | | | | debug the crypto functionzotlabs2018-02-071-0/+3
| | | | |
* | | | | 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
| | | | |