aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 schema
| | * updates to Postgres schemaWaitman Gobble2015-11-111-7/+7
| | |
* | | run markdown through html purifier for those who insist on mixing html with ↵redmatrix2015-11-112-2/+3
|/ / | | | | | | markdown.
* | Merge pull request #144 from kenrestivo/api-auth-fixken restivo2015-11-111-0/+1
|\ \ | |/ |/| api_auth.php must be included since the function moved.
| * 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
| * | Bust out import_account() into a separate function to allow importing ↵ken restivo2015-11-101-3/+13
| | | | | | | | | | | | accounts by proxy, i.e. for admins to import a channel on behalf of a user.
* | | Merge pull request #141 from HaakonME/masterredmatrix2015-11-111-0/+5
|\ \ \ | | | | | | | | Added Hubzilla plugin repo for ownMapp - decentralized and private map sharing
| * \ \ 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 RM
| * | | | | | Moving this out into a plugin; hopefully one that will work with Redmatrix ↵ken restivo2015-11-101-89/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | as well.
* | | | | | 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
| * | | | | Move api_auth() out to a file that can be included from plugins/modules to ↵ken restivo2015-11-103-90/+96
|/ / / / / | | | | | | | | | | | | | | | allow them to expose their own programmatic API.
* | | | | 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.
| | * | | 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
| | * | 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.
| | * | | 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
| |\ \ \ \ | | | | | | | | | | | | First attempt at auto-generating the schemaspy docs
| | * | | | Correct directory (this runs from inside hubzilla_erken restivo2015-11-081-1/+1
| | | | | |
| | * | | | First attempt at auto-generating schemaspy.ken restivo2015-11-082-0/+26
| | |/ / /
| * | | | This is betterjeroenpraat2015-11-091-2/+2
| | | | |
| * | | | Using bootstrap classes, so other themes/schemas also work. Plus margin when ↵jeroenpraat2015-11-092-7/+2
| | | | | | | | | | | | | | | | | | | | collapsed.
* | | | | thwart attempts to use an external private directory as a directory serverredmatrix2015-11-091-0/+13
|/ / / /
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-093-1823/+1966
|\ \ \ \
| * \ \ \ Merge pull request #137 from wave72/masterWave2015-11-092-1823/+1876
| |\ \ \ \ | | |/ / / | |/| | | Updated Italian strings
| | * | | Updated Italian stringsPaolo Tacconi2015-11-092-1823/+1876
| | | | |
| | * | | Merge pull request #2 from redmatrix/masterWave2015-11-06308-11295/+14575
| | |\ \ \ | | | | | | | | | | | | Update to latest hubzilla
| * | \ \ \ Merge pull request #133 from kenrestivo/export-v1redmatrix2015-11-091-0/+90
| |\ \ \ \ \ | | | | | | | | | | | | | | First pass at endpoints for exporting users and channels as admin.
| | * | | | | First pass at endpoints for exporting users and channels in bulk as admin.ken restivo2015-11-081-0/+90
| |/ / / / /
* | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-092-7/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md version.inc
| * | | | | remove references to redmatrix.meredmatrix2015-11-095-10/+10
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 00:23:48 +0000