aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | minor change on inviteredmatrix2015-09-111-1/+1
| |/ |/|
* | separate the linksredmatrix2015-09-101-1/+1
| |
* | forum mode - use linked avatar and name for title instead of "Channel: ↵redmatrix2015-09-101-1/+1
| | | | | | | | xxxxx" or "Forum: xxxx"
* | duplicated coderedmatrix2015-09-101-8/+0
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-101-0/+8
|\| | | | | | | | | Conflicts: mod/like.php
| * export likes to clonesredmatrix2015-09-101-1/+15
| |
* | sync likesredmatrix2015-09-105-2/+59
| |
* | provide remote delivery report at logger_debug levelredmatrix2015-09-101-2/+2
| |
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-1010-108/+52
|\ \
| * | fix radius settingMario Vavti2015-09-101-1/+1
| | |
| * | make redmatrix focus scheme default for hubzillaMario Vavti2015-09-1010-108/+52
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-104-467/+477
|\ \ \ | |/ / |/| / | |/ | | Conflicts: include/zot.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-102-463/+463
| |\
| | * update Spanish stringsjeroenpraat2015-09-102-463/+463
| | |
| * | zot_refresh: always try the hubloc pointed to by xchan_addr firstredmatrix2015-09-102-4/+13
| |/
* | ensure connections have a nameredmatrix2015-09-101-0/+2
| |