| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-23 | 5 | -12/+61 |
|\ |
|
| * | Merge pull request #565 from anaqreon/wiki-download | zotlabs | 2016-10-23 | 3 | -0/+35 |
| |\ |
|
| | * | Add wiki download button to export the selected wiki repo to a zip file | Andrew Manning | 2016-10-22 | 3 | -0/+35 |
| * | | Merge pull request #562 from fsteinel/issue-561 | zotlabs | 2016-10-23 | 2 | -12/+26 |
| |\ \ |
|
| | * | | until we've settled on what they should be, set os_path and display_path to a... | Florian Steinel | 2016-10-22 | 1 | -2/+2 |
| | * | | attach_mkdir use $os_path and $display_path initilized to an empty string | Florian Steinel | 2016-10-22 | 1 | -2/+6 |
| | * | | add column display_path to inserts into attachment, as this column is a not n... | Florian Steinel | 2016-10-22 | 2 | -12/+22 |
* | | | | need to perform dbunescbin on stored filenames as well as binary data - this ... | zotlabs | 2016-10-23 | 3 | -5/+5 |
* | | | | misplaced parens | zotlabs | 2016-10-23 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-22 | 3 | -17/+3 |
|\ \ \ |
|
| * | | | provide lockstate for events and remove obsolete code | Mario Vavti | 2016-10-22 | 3 | -17/+3 |
| | |/
| |/| |
|
* / | | php warning, $uplink didn't have a default | zotlabs | 2016-10-22 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-21 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge pull request #563 from ilu33/dev | zotlabs | 2016-10-22 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Postgres complaining again ... | ilu33 | 2016-10-22 | 1 | -1/+1 |
| | |/ |
|
* | / | issue #564 | zotlabs | 2016-10-21 | 2 | -2/+2 |
|/ / |
|
* / | squash timezone adjusted birthdays into a single day in the calendar, by lyin... | zotlabs | 2016-10-21 | 1 | -0/+6 |
|/ |
|
* | better fix for navbar channel autocomplete, refrain from search until a minim... | zotlabs | 2016-10-21 | 1 | -1/+1 |
* | full revert, that wasn't working at all. Not sure why. | zotlabs | 2016-10-21 | 1 | -3/+1 |
* | partial revert | zotlabs | 2016-10-21 | 1 | -3/+2 |
* | fine tune the navbar people autocomplete, as the check for minimum length was... | zotlabs | 2016-10-21 | 1 | -1/+4 |
* | string update | zotlabs | 2016-10-21 | 1 | -3031/+3032 |
* | remove more corporate code - https url conversion for youtube is now handled ... | zotlabs | 2016-10-20 | 1 | -11/+1 |
* | Merge pull request #558 from dawnbreak/dev | zotlabs | 2016-10-21 | 2 | -28/+136 |
|\ |
|
| * | [BUGFIX] for fromStandalonePermission(). | Klaus Weidenbach | 2016-10-20 | 2 | -28/+136 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-20 | 1 | -7/+5 |
|\ |
|
| * | Merge pull request #556 from dawnbreak/QA_testing | zotlabs | 2016-10-20 | 1 | -7/+5 |
| |\ |
|
| | * | [TASK] Fix travis' phpunit execution. | Klaus Weidenbach | 2016-10-19 | 1 | -7/+5 |
| |/ |
|
* | | discover tab showing on network page using fresh site with no settings (it is... | zotlabs | 2016-10-19 | 1 | -1/+5 |
* | | when translating like activities, we're distinguishing comments from posts by... | zotlabs | 2016-10-18 | 1 | -1/+1 |
|/ |
|
* | remove requirement that imported profile photos be in the profile photos album | zotlabs | 2016-10-18 | 1 | -1/+1 |
* | Change the behaviour of 'use existing photo for profile'. For a channel with ... | zotlabs | 2016-10-18 | 2 | -11/+36 |
* | change event behaviour - share by default. | zotlabs | 2016-10-18 | 2 | -6/+4 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-18 | 16 | -122/+321 |
|\ |
|
| * | Merge pull request #555 from dawnbreak/QA_testing | zotlabs | 2016-10-19 | 16 | -122/+321 |
| |\ |
|
| | * | [TASK] Restructure tests/ folder. | Klaus Weidenbach | 2016-10-19 | 16 | -122/+321 |
| |/ |
|
* | | more fixes to addons doc, include project addons in string extraction for tra... | zotlabs | 2016-10-18 | 3 | -4458/+7490 |
* | | bring the addons list up to date | zotlabs | 2016-10-18 | 1 | -5/+8 |
|/ |
|
* | Merge pull request #554 from dawnbreak/composer-light | zotlabs | 2016-10-19 | 51 | -483/+2090 |
|\ |
|
| * | [FEATURE] Add config and use composer autoloader. | Klaus Weidenbach | 2016-10-18 | 51 | -483/+2090 |
|/ |
|
* | add get_photo hook to go along with get_profile_photo hook. This allows a plu... | zotlabs | 2016-10-17 | 4 | -14/+29 |
* | array_key_exists warning on PConfig::Delete() | zotlabs | 2016-10-17 | 1 | -6/+9 |
* | issue #549, ACL has 'public' selected even when restrictive ACL is being used. | zotlabs | 2016-10-17 | 2 | -5/+31 |
* | issue #553 - negative birthday from directory. This may not completely fix it... | zotlabs | 2016-10-17 | 1 | -1/+1 |
* | if we have to go through this contortion every time we change a DB column fro... | zotlabs | 2016-10-17 | 1 | -1/+4 |
* | "alter table alter" has completely different rules between postgres and mysql | zotlabs | 2016-10-17 | 1 | -1/+7 |
* | rename diaspora2bb() to markdown_to_bb() to reflect that is has a more generi... | zotlabs | 2016-10-16 | 4 | -4/+4 |
* | issue #550 | zotlabs | 2016-10-16 | 1 | -1/+1 |
* | add new hook doc | zotlabs | 2016-10-14 | 2 | -0/+8 |
* | remove corporate codes from diaspora2bb, add plugin hook markdown_to_bb | zotlabs | 2016-10-14 | 1 | -5/+2 |