aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* issue #51redmatrix2015-09-211-0/+12
|
* looks like chat has been neglected a bit recentlyredmatrix2015-09-202-4/+3
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-13/+43
|\ | | | | | | | | Conflicts: include/zot.php
| * new delivery report formatredmatrix2015-09-202-13/+42
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-3/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * improve on the last attemptredmatrix2015-09-201-4/+4
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-4/+13
|\| | | | | | | | | Conflicts: include/zot.php
| * catch the timestamp alsoredmatrix2015-09-201-1/+1
| |
| * remove system flags from channel import packetredmatrix2015-09-201-5/+9
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-1/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * we need the xchan record alsoredmatrix2015-09-201-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-0/+46
|\|
| * initial checkin delivery report classredmatrix2015-09-201-0/+46
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-191-0/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * clone new connection requestsredmatrix2015-09-191-18/+19
| |
* | clone new connectionsredmatrix2015-09-191-17/+18
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-181-1/+1
|\|
| * include site identitfier on redmatrix delivery reports alsoredmatrix2015-09-181-0/+2
| |
* | add reporting site to delivery reportredmatrix2015-09-182-0/+5
| |
* | more work on surviving hub re-installsredmatrix2015-09-181-2/+6
| |
* | change photo permissions when attach permissions are changed through ↵redmatrix2015-09-181-1/+11
| | | | | | | | mod/filestorage, and fix lockview for photos.
* | start hooking in the new webfinger/zot merged discoveryredmatrix2015-09-171-6/+10
| |
* | consolidate zotfinger and webfingerredmatrix2015-09-172-2/+290
| |
* | change matrix to grid, begin webfinger optimisationredmatrix2015-09-162-4/+4
| |
* | nitredmatrix2015-09-141-1/+1
| |
* | don't deliver to dead hubsredmatrix2015-09-142-27/+18
| |
* | 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
| |
* | ping site function (taken from admin/hubloc)redmatrix2015-09-131-1/+26
| |
* | 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/redmatrix into pending_mergeredmatrix2015-09-112-20/+36
|\| | | |/ |/| | | | | Conflicts: util/messages.po
| * another tactic to deal with orphan hublocs from re-installs, or at least ↵redmatrix2015-09-112-20/+36
| | | | | | | | allow the descendant channel to survive
* | sync likesredmatrix2015-09-102-0/+40
| |
* | provide remote delivery report at logger_debug levelredmatrix2015-09-101-2/+2
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-101-3/+13
|\| | | | | | | | | Conflicts: include/zot.php
| * zot_refresh: always try the hubloc pointed to by xchan_addr firstredmatrix2015-09-101-3/+12
| |
| * export TERM_FILE when mirroringredmatrix2015-09-082-1/+7
| |
| * add sync packets for menusredmatrix2015-09-081-0/+11
| |
* | ensure connections have a nameredmatrix2015-09-101-0/+2
| |
* | don't auto-open the editor in forum mode. Save the forum selection text ↵redmatrix2015-09-091-0/+1
| | | | | | | | until we open it.
* | major changes to "forum mode" on the network/matrix pageredmatrix2015-09-091-1/+1
| |
* | slight hack to improve public forum detection in the forum widgetredmatrix2015-09-092-1/+4
| |
* | preserve code blocks on item import if channel has code rights. When ↵redmatrix2015-09-083-3/+81
| | | | | | | | | | | | importing the channel itself, turn code access off unless this is the admin.
* | move mod_admin to Comanche finallyredmatrix2015-09-081-0/+59
| |
* | export TERM_FILE when mirroringredmatrix2015-09-081-2/+7
| |
* | debugging menu syncredmatrix2015-09-082-2/+3
| |