aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 wi…
| | * | Started correcting vestiges of the RedMatrix and matrix, replacing with ↵Andrew Manning2015-09-164-35/+35
| |/ / | | | | | | | | | Hubzilla and grid
| * | Merge pull request #44 from mrjive/move_submit_buttonredmatrix2015-09-171-7/+5
| |\ \ | | | | | | | | moved submit button to the bottom in settings.tpl
| | * | 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_select
| | * | 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 ↵jeroenpraat2015-09-1515-0/+0
| | | | | | | | metadata from PNG files.
* | 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 ↵redmatrix2015-09-153-1/+3
| | | | | | | | another project. I'll let you read the logs and figure it out for yourself. Follow the trail of evidence and you'll discover the truth.
* | 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
| |\ \ | | | | | | | | Display load average on the siteinfo page
| | * | 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 ↵redmatrix2015-09-131-1/+1
| | | | | | | | consistency.
* | 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
|\ \
| * | an attempt to fix the banner messMario Vavti2015-09-123-27/+18
| | |
* | | check for empty word after trimredmatrix2015-09-121-0/+4
|/ /
* | Merge pull request #38 from MicMee/masterredmatrix2015-09-121-3/+3
|\ \ | | | | | | ensure that living sites are marked as alive
| * | ensure that living sites are marked as aliveMichael Meer2015-09-111-3/+3
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-111-1/+4
|\ \ \ | | |/ | |/|
| * | log the remote message if there was oneredmatrix2015-09-111-1/+4
| | |
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-117-25/+22
|\ \ \ | | |/ | |/|
| * | center page content by default - css fileMario Vavti2015-09-111-0/+8
| | |
| * | center page content by defaultMario Vavti2015-09-116-23/+13
| | |
| * | css fixMario Vavti2015-09-111-2/+1
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-113-21/+37
|\ \ \ | | |/ | |/| | | | | | | Conflicts: util/messages.po
| * | another tactic to deal with orphan hublocs from re-installs, or at least ↵redmatrix2015-09-114-205/+221
| | | | | | | | | | | | allow the descendant channel to survive