aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-235-12/+61
|\
| * Merge pull request #565 from anaqreon/wiki-downloadzotlabs2016-10-233-0/+35
| |\
| | * Add wiki download button to export the selected wiki repo to a zip fileAndrew Manning2016-10-223-0/+35
| * | Merge pull request #562 from fsteinel/issue-561zotlabs2016-10-232-12/+26
| |\ \
| | * | until we've settled on what they should be, set os_path and display_path to a...Florian Steinel2016-10-221-2/+2
| | * | attach_mkdir use $os_path and $display_path initilized to an empty stringFlorian Steinel2016-10-221-2/+6
| | * | add column display_path to inserts into attachment, as this column is a not n...Florian Steinel2016-10-222-12/+22
* | | | need to perform dbunescbin on stored filenames as well as binary data - this ...zotlabs2016-10-233-5/+5
* | | | misplaced parenszotlabs2016-10-231-1/+1
|/ / /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-223-17/+3
|\ \ \
| * | | provide lockstate for events and remove obsolete codeMario Vavti2016-10-223-17/+3
| | |/ | |/|
* / | php warning, $uplink didn't have a defaultzotlabs2016-10-221-1/+1
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-211-1/+1
|\ \
| * \ Merge pull request #563 from ilu33/devzotlabs2016-10-221-1/+1
| |\ \
| | * | Postgres complaining again ...ilu332016-10-221-1/+1
| | |/
* | / issue #564zotlabs2016-10-212-2/+2
|/ /
* / squash timezone adjusted birthdays into a single day in the calendar, by lyin...zotlabs2016-10-211-0/+6
|/
* better fix for navbar channel autocomplete, refrain from search until a minim...zotlabs2016-10-211-1/+1
* full revert, that wasn't working at all. Not sure why.zotlabs2016-10-211-3/+1
* partial revertzotlabs2016-10-211-3/+2
* fine tune the navbar people autocomplete, as the check for minimum length was...zotlabs2016-10-211-1/+4
* string updatezotlabs2016-10-211-3031/+3032
* remove more corporate code - https url conversion for youtube is now handled ...zotlabs2016-10-201-11/+1
* 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
* | 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
* "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