aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-157-1138/+1160
|\
| * nl+es and some other bitsjeroenpraat2015-11-147-1138/+1160
* | issues connecting to local forumredmatrix2015-11-153-13/+9
|/
* superblock enhancementsredmatrix2015-11-134-533/+543
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-123-4/+4
|\
| * Add note about base64 and urlencode.ken restivo2015-11-121-2/+2
| * Fix spelling of documentation.ken restivo2015-11-122-2/+2
* | really basic photo album widget for content regionsredmatrix2015-11-123-0/+87
|/
* allow pdl contentredmatrix2015-11-124-1/+23
* issue #154redmatrix2015-11-121-0/+11
* small fixes, removed old unused database row, and log more prominently a miss...redmatrix2015-11-123-2/+3
* Small update to Bluegrid and generic-content-wrapper-styled to dreportjeroenpraat2015-11-122-3/+4
* will also need api docoredmatrix2015-11-112-1/+24
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-111-7/+7
|\
| * Merge pull request #149 from waitman/masterredmatrix2015-11-121-7/+7
| |\
| | * updates to Postgres schemaWaitman Gobble2015-11-111-7/+7
* | | run markdown through html purifier for those who insist on mixing html with m...redmatrix2015-11-112-2/+3
|/ /
* | Merge pull request #144 from kenrestivo/api-auth-fixken restivo2015-11-111-0/+1
|\ \ | |/ |/|
| * api_auth.php must be included since the function moved.ken restivo2015-11-111-0/+1
* | Merge pull request #143 from kenrestivo/allow-importing-by-proxyredmatrix2015-11-111-3/+13
|\ \
| * | Bust out import_account() into a separate function to allow importing account...ken restivo2015-11-101-3/+13
* | | Merge pull request #141 from HaakonME/masterredmatrix2015-11-111-0/+5
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-112-2/+2
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-102-2/+2
| |\ \ \ \
| * | | | | Fixed ownMapp repo addressHaakon Meland Eriksen2015-11-101-1/+1
| * | | | | Fixed ownMapp repo addressHaakon Meland Eriksen2015-11-101-1/+1
| * | | | | Fixed ownMapp repo addressHaakon Meland Eriksen2015-11-101-3/+3
| * | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1039-1956/+2223
| |\ \ \ \ \
| * | | | | | Add ownMapHaakon Meland Eriksen2015-11-101-0/+5
* | | | | | | Merge pull request #140 from kenrestivo/move-export-to-pluginredmatrix2015-11-111-89/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Moving this out into a plugin; hopefully one that will work with Redmatrix as...ken restivo2015-11-101-89/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #142 from kenrestivo/refactor-out-api-authredmatrix2015-11-113-90/+96
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Move api_auth() out to a file that can be included from plugins/modules to al...ken restivo2015-11-103-90/+96
|/ / / / /
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge0.11redmatrix2015-11-102-2/+2
|\| | | |
| * | | | Merge pull request #139 from sasiflo/masterredmatrix2015-11-112-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Replaced references to redmatrix logo.sasiflo2015-11-102-2/+2
| |/ / /
* / / / do a better job of preserving linebreaks in posts for channels that use markdownredmatrix2015-11-102-2/+2
|/ / /
* | | more docoredmatrix2015-11-092-0/+24
* | | remove the obsolete avatar_img function (gravatar/libravatar lookup)redmatrix2015-11-093-26/+0
* | | get rid of the pre-comanche widget placement and wgl coderedmatrix2015-11-094-48/+0
* | | more docoredmatrix2015-11-097-4/+41
* | | add avatars to likes/dislikes/etc.redmatrix2015-11-092-2/+8
* | | remove list bullets from extended like listredmatrix2015-11-092-1/+5
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-09482-123705/+31
|\ \ \
| * | | Merge pull request #134 from HaakonME/masterredmatrix2015-11-10477-123697/+0
| |\| |
| | * | Keep only zot.meta.xml for schemaSpy report generation, not the report itselfHaakon Meland Eriksen2015-11-09477-123697/+0
| * | | Merge pull request #135 from kenrestivo/account-id-linkredmatrix2015-11-101-1/+3
| |\ \ \
| | * | | Manually document account_id link for schemaSpy.ken restivo2015-11-081-1/+3
| * | | | Merge pull request #136 from kenrestivo/generate-schemaspyredmatrix2015-11-102-0/+26
| |\ \ \ \
| | * | | | Correct directory (this runs from inside hubzilla_erken restivo2015-11-081-1/+1