aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* start hooking in the new webfinger/zot merged discoveryredmatrix2015-09-171-6/+10
* consolidate zotfinger and webfingerredmatrix2015-09-175-291/+299
* Converse width for a few related (old) schemas back to 1024px / Name default ...jeroenpraat2015-09-176-6/+15
* missing refernce to arrayMario Vavti2015-09-171-1/+1
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-09-173-5/+5
|\
| * Merge pull request #46 from anaqreon/mastergit-marijus2015-09-173-5/+5
| |\
| | * Corrected some missing space typos in docsAndrew Manning2015-09-173-5/+5
* | | quickfix for private messages - needs a lot more workMario Vavti2015-09-175-48/+56
|/ /
* / Revert "moved submit button to the bottom in settings.tpl"Mario Vavti2015-09-171-5/+7
|/
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-161-1/+1
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-1612-197/+199
| |\
| * | push revisionredmatrix2015-09-161-1/+1
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-160-0/+0
|\ \ \ | | |/ | |/|
| * | Cleaned some wrong metadata from PNG files.jeroenpraat2015-09-159-0/+0
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-166-47/+45
|\ \ \
| * \ \ Merge pull request #45 from anaqreon/masterredmatrix2015-09-174-35/+35
| |\ \ \
| | * | | Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzi...Andrew Manning2015-09-164-35/+35
| |/ / /
| * | | Merge pull request #44 from mrjive/move_submit_buttonredmatrix2015-09-171-7/+5
| |\ \ \
| | * | | moved submit button to the bottom in settings.tplmrjive2015-09-161-7/+5
| * | | | Merge pull request #43 from mrjive/toggleselectredmatrix2015-09-171-5/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | added toggle_selectmrjive2015-09-161-5/+5
| |/ / /
* / / / change matrix to grid, begin webfinger optimisationredmatrix2015-09-164-18/+15
|/ / /
* | | serve as application/xrd+xmlredmatrix2015-09-152-2/+2
* | | italian string correctionredmatrix2015-09-151-1/+1
* | | Less marginjeroenpraat2015-09-153-0/+0
* | | Made the favicons a bit sharper (direct from SVG) and cleaned some wrong meta...jeroenpraat2015-09-1515-0/+0
* | | make sure we've got a doc typeredmatrix2015-09-151-1/+1
* | | I'm not going to tell you what's wrong because I'll be accused of bashing ano...redmatrix2015-09-153-1/+3
* | | personaredmatrix2015-09-141-0/+1
* | | nitredmatrix2015-09-141-1/+1
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-142-194/+194
|\| |
| * | Small update Spanish stringsjeroenpraat2015-09-142-194/+194
| * | quick fix for choklet bannertwoMario Vavti2015-09-141-3/+5
| |/
* | we need an owner for permissions_sqlredmatrix2015-09-141-1/+9
* | don't deliver to dead hubsredmatrix2015-09-142-27/+18
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-142-0/+6
|\ \
| * \ Merge pull request #41 from redmatrix/display_load_averageredmatrix2015-09-152-0/+6
| |\ \
| | * | Update siteinfo.tpljeroenpraat2015-09-141-0/+1
| | * | Update siteinfo.phpjeroenpraat2015-09-141-0/+5
* | | | site checking stuffredmatrix2015-09-143-3/+74
|/ / /
* / / remove xchan_instance_url - it needs to be an abook field, not an xchan fieldredmatrix2015-09-141-14/+0
|/ /
* | quick fix for choklet bannertwoMario Vavti2015-09-142-4/+6
* | ping site function (taken from admin/hubloc)redmatrix2015-09-131-1/+26
* | mod_locs - put the primary into a (non-functioning) button for visual consist...redmatrix2015-09-131-1/+1
* | updateredmatrix2015-09-131-0/+1
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-136-26/+20
|\ \
| * | fix banner for full flavourMario Vavti2015-09-131-4/+3
| * | hopefully fix banner for choklet flavourMario Vavti2015-09-135-22/+17
* | | profile photo change activitiesredmatrix2015-09-131-5/+67
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-123-27/+18
|\ \