aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | suppress duplicate locations in connedit, issue #111redmatrix2015-11-081-0/+4
| | | |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-082-4/+37
|\ \ \ \
| * \ \ \ Merge pull request #132 from kenrestivo/test-for-emailredmatrix2015-11-092-4/+37
| |\ \ \ \ | | | | | | | | | | | | Add unit tests for valid email function.
| | * | | | Add unit tests for valid email function.ken restivo2015-11-082-4/+37
| | | | | |
* | | | | | some more db docoredmatrix2015-11-086-29/+32
|/ / / / /
* | | | | make jotnets modalredmatrix2015-11-083-3/+21
| | | | |
* | | | | no comment permission bug, also implement delete() in RedDirectory per Waitmanredmatrix2015-11-082-8/+34
|/ / / /
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-081-3/+6
|\ \ \ \
| * \ \ \ Merge pull request #131 from tluther/masterredmatrix2015-11-091-3/+6
| |\ \ \ \ | | | | | | | | | | | | Quick fix: Moved Twitter select box to the top of ACL selector
| | * | | | Quick fix: Moved Twitter select box to the top of ACL selectorTobias Luther2015-11-081-3/+6
| |/ / / /
* / / / / relative attachment not fetched due to os filename issueredmatrix2015-11-082-2/+5
|/ / / /
* | | | Merge pull request #129 from HaakonME/masterredmatrix2015-11-08848-1/+213332
|\ \ \ \ | | | | | | | | | | Hubzilla database entity-relationship documentation and HonO fix
| * \ \ \ 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 ↵Haakon Meland Eriksen2015-11-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | becomes unavailable
* | | | | | | | | 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 ↵jeroenpraat2015-11-085-3617/+3723
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | strings) - Update nl+es
* | | | | | | | more db schema docoredmatrix2015-11-064-67/+71
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #130 from kenrestivo/link-from-humanredmatrix2015-11-072-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Human docs > Computer-generated Docs
| * | | | | | | 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
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php install/update.php
| * | | | | | 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 ↵jeroenpraat2015-11-054-3/+8
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon).
* | | | | | handle old files with partial pathsredmatrix2015-11-053-6/+18
| | | | | |