aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding original jot.tpl from GitHubHaakon Meland Eriksen2015-11-131-49/+54
|
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1316-10/+132
|\
| * 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 ↵redmatrix2015-11-123-2/+3
| | | | | | | | missing directory server URL
| * Small update to Bluegrid and generic-content-wrapper-styled to dreportjeroenpraat2015-11-122-3/+4
| |
* | Reorder buttonsHaakon Meland Eriksen2015-11-131-53/+48
| |
* | Reverted changes - got white screenHaakon Meland Eriksen2015-11-131-47/+52
| |
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-131-7/+8
| |
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-131-3/+0
| |
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-121-21/+12
| |
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-121-31/+29
| |
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-125-10/+34
|\|
| * 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.
* | | Make upload and encrypt easier on phones by editing jot.tplHaakon Meland Eriksen2015-11-121-13/+11
| | |
* | | Promoted upload of images and encryptionHaakon Meland Eriksen2015-11-111-0/+10
| | |
* | | Rearranged comment buttons backHaakon Meland Eriksen2015-11-111-13/+10
| | |
* | | Rearranged comment buttonsHaakon Meland Eriksen2015-11-111-10/+13
|/ /
* | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 07:05:51 +0000