aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into pdozotlabs2016-10-204-36/+146
|\
| * Merge pull request #558 from dawnbreak/devzotlabs2016-10-212-28/+136
| |\
| | * [BUGFIX] for fromStandalonePermission().Klaus Weidenbach2016-10-202-28/+136
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-201-7/+5
| |\
| | * Merge pull request #556 from dawnbreak/QA_testingzotlabs2016-10-201-7/+5
| | |\
| | | * [TASK] Fix travis' phpunit execution.Klaus Weidenbach2016-10-191-7/+5
| | |/
| * | discover tab showing on network page using fresh site with no settings (it is...zotlabs2016-10-191-1/+5
* | | more pdo tweakszotlabs2016-10-201-3/+24
* | | pdo testingzotlabs2016-10-202-7/+17
* | | use pdo for postgres alsozotlabs2016-10-195-17/+32
* | | pdo fixeszotlabs2016-10-191-4/+4
* | | pdo changes first cutzotlabs2016-10-192-30/+27
* | | Merge branch 'dev' into pdozotlabs2016-10-1983-5111/+10022
|\| |
| * | when translating like activities, we're distinguishing comments from posts by...zotlabs2016-10-181-1/+1
| |/
| * remove requirement that imported profile photos be in the profile photos albumzotlabs2016-10-181-1/+1
| * Change the behaviour of 'use existing photo for profile'. For a channel with ...zotlabs2016-10-182-11/+36
| * change event behaviour - share by default.zotlabs2016-10-182-6/+4
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-1816-122/+321
| |\
| | * Merge pull request #555 from dawnbreak/QA_testingzotlabs2016-10-1916-122/+321
| | |\
| | | * [TASK] Restructure tests/ folder.Klaus Weidenbach2016-10-1916-122/+321
| | |/
| * | more fixes to addons doc, include project addons in string extraction for tra...zotlabs2016-10-183-4458/+7490
| * | bring the addons list up to datezotlabs2016-10-181-5/+8
| |/
| * Merge pull request #554 from dawnbreak/composer-lightzotlabs2016-10-1951-483/+2090
| |\
| | * [FEATURE] Add config and use composer autoloader.Klaus Weidenbach2016-10-1851-483/+2090
| |/
| * add get_photo hook to go along with get_profile_photo hook. This allows a plu...zotlabs2016-10-174-14/+29
| * array_key_exists warning on PConfig::Delete()zotlabs2016-10-171-6/+9
| * issue #549, ACL has 'public' selected even when restrictive ACL is being used.zotlabs2016-10-172-5/+31
| * issue #553 - negative birthday from directory. This may not completely fix it...zotlabs2016-10-171-1/+1
| * if we have to go through this contortion every time we change a DB column fro...zotlabs2016-10-171-1/+4
* | some pdo workzotlabs2016-10-171-6/+12
|/
* "alter table alter" has completely different rules between postgres and mysqlzotlabs2016-10-171-1/+7
* rename diaspora2bb() to markdown_to_bb() to reflect that is has a more generi...zotlabs2016-10-164-4/+4
* issue #550zotlabs2016-10-161-1/+1
* add new hook doczotlabs2016-10-142-0/+8
* remove corporate codes from diaspora2bb, add plugin hook markdown_to_bbzotlabs2016-10-141-5/+2
* remove loggingzotlabs2016-10-141-1/+1
* permissions issuezotlabs2016-10-142-4671/+4690
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-1336-1783/+1864
|\
| * Merge pull request #547 from dawnbreak/docuzotlabs2016-10-1436-1786/+1868
| |\
| | * [TASK] Update Doxyfile and fix Doxygen errors.Klaus Weidenbach2016-10-1336-1786/+1868
* | | try to filter any path information from leaking through to zot_finger; and lo...zotlabs2016-10-132-1/+7
|/ /
* / provide text log results of email success/failure rather than 1 and 0.zotlabs2016-10-133-7/+7
|/
* additional array checkingzotlabs2016-10-135-14/+27
* consolidate duplicated code for creating table entries from an arrayzotlabs2016-10-124-161/+51
* minorzotlabs2016-10-122-1/+2
* allow hooks to have negative priorityzotlabs2016-10-124-4/+17
* remove special handling of lookalike '@ char from attach pathzotlabs2016-10-121-2/+2
* Merge pull request #545 from dawnbreak/atfixzotlabs2016-10-131-3/+3
|\
| * Comment and code about UTF-8 @-sign do not match.Klaus Weidenbach2016-10-111-3/+3
* | caught one typo from the last checkinzotlabs2016-10-121-1/+1