aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Quick fix: Moved Twitter select box to the top of ACL selectorTobias Luther2015-11-081-3/+6
* Merge pull request #129 from HaakonME/masterredmatrix2015-11-08848-1/+213332
|\
| * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-074-67/+71
| |\
| * \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-0711-1593/+1695
| |\ \
| * | | Hubzilla report created by schemaSpy using zot.meta.xml to imply relationshipsHaakon Meland Eriksen2015-11-06847-0/+213332
| * | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-06174-11/+741
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-059-26/+58
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-0524-659/+1649
| |\ \ \ \ \
| * | | | | | Removed fixed directory server - new list available in admin panel if one bec...Haakon Meland Eriksen2015-11-041-1/+0
* | | | | | | A few quotes too many. Also translations for tooltip.jeroenpraat2015-11-081-5/+5
* | | | | | | Fix ffsapi for non-English languages (or better when 's was used in the strin...jeroenpraat2015-11-085-3617/+3723
| |_|_|_|_|/ |/| | | | |
* | | | | | more db schema docoredmatrix2015-11-064-67/+71
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #130 from kenrestivo/link-from-humanredmatrix2015-11-072-1/+1
|\ \ \ \ \
| * | | | | Human > computerken restivo2015-11-062-1/+1
* | | | | | update db doco for attach structure to match hubzilla schemaredmatrix2015-11-061-7/+9
|/ / / / /
* | | | | update the abook schema doco with the hubzilla schema changesredmatrix2015-11-061-19/+11
* | | | | database schema documentation for item tableredmatrix2015-11-061-49/+96
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-063-8/+27
|\ \ \ \ \
| * | | | | rev updateredmatrix2015-11-064-9/+13
| * | | | | forgot this oneredmatrix2015-11-041-1/+1
* | | | | | version and string updateredmatrix2015-11-063-1509/+1551
| |_|_|_|/ |/| | | |
* | | | | more hook docoredmatrix2015-11-052-0/+20
* | | | | a bit of explanation at the beginningredmatrix2015-11-051-0/+5
* | | | | add the hook detail to the doco listredmatrix2015-11-051-0/+1
* | | | | more work on hook docoredmatrix2015-11-055-6/+8
* | | | | update hooklistredmatrix2015-11-052-4/+121
* | | | | the journey of 1000 miles begins with a single stepredmatrix2015-11-051-0/+28
* | | | | preliminary hook detail filesredmatrix2015-11-05162-0/+162
* | | | | typoredmatrix2015-11-051-1/+1
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-054-3/+8
|\ \ \ \ \
| * | | | | Firefox Share app. Paper plane icon is public domain. Shorted the name in ffs...jeroenpraat2015-11-054-3/+8
| | |_|_|/ | |/| | |
* | | | | handle old files with partial pathsredmatrix2015-11-053-6/+18
* | | | | first cut at some much better hook documentation derived from bamfic's automa...redmatrix2015-11-052-1/+379
|/ / / /
* | | | Firefox share (that seems now the official name) button added to misc. settings.jeroenpraat2015-11-053-7/+20
* | | | Style the buttonjeroenpraat2015-11-051-2/+2
* | | | fix the file chunking api now that we've got working data to test withredmatrix2015-11-052-2/+2
* | | | fix path for attachments using os_storage uploaded through attach_storeredmatrix2015-11-042-3/+3
* | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-043-15/+34
|\| | | | |_|/ |/| |
| * | dummy updateredmatrix2015-11-042-2/+6
* | | re-arrange file api calls so the api pathnames don't shadow each otherredmatrix2015-11-041-21/+25
* | | api calls to fetch file (attach) meta data and to chunk file content fetching...redmatrix2015-11-041-0/+57
* | | menu_list() takes a channel_id, not the whole channel arrayredmatrix2015-11-041-1/+3
* | | typoredmatrix2015-11-041-1/+1
* | | add bookmarking to FF social api providerredmatrix2015-11-043-3/+3
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-0418-657/+1520
|\ \ \
| * \ \ Merge pull request #124 from kenrestivo/add-app-example2redmatrix2015-11-051-0/+421
| |\ \ \
| | * | | Clarify format.ken restivo2015-11-041-2/+1
| | * | | Add app object detailed example.ken restivo2015-11-041-0/+422
| * | | | Chat page improved (I think). Works now better with diff. resolutions, font s...jeroenpraat2015-11-046-18/+39
| * | | | Merge pull request #125 from wave72/masterWave2015-11-042-638/+678
| |\ \ \ \ | | |/ / / | |/| | |