aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replaced references to redmatrix logo.sasiflo2015-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
| | * | | 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
* | | | 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 stringsPaolo Tacconi2015-11-092-1823/+1876
| | * | Merge pull request #2 from redmatrix/masterWave2015-11-06308-11295/+14575
| | |\ \
| * | \ \ Merge pull request #133 from kenrestivo/export-v1redmatrix2015-11-091-0/+90
| |\ \ \ \
| | * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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.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 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
|\ \ \ \
| * \ \ \ 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