aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-081-1/+10
|\| | | | | | | | | Conflicts: include/identity.php
| * menu exportredmatrix2015-09-081-1/+11
| |
* | menu import and syncredmatrix2015-09-085-2/+154
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-0/+19
|\|
| * export eventsredmatrix2015-09-071-0/+19
| |
* | work on event syncredmatrix2015-09-072-1/+82
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-1/+15
|\|
| * create event sync packetsredmatrix2015-09-071-0/+14
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-4/+6
|\| | | | | | | | | | | | | Conflicts: include/items.php view/it/messages.po view/it/strings.php
| * fix postgres zotfeedHabeas Codice2015-09-071-4/+6
| |
* | consolidate import_items/sync_itemsredmatrix2015-09-073-3/+83
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-2/+2
|\| | | | | | | | | Conflicts: util/messages.po
| * PRIVACY: item_private seems to have been removed from permissions_sql ↵redmatrix2015-09-071-2/+2
| | | | | | | | checking with an observer.
| * export chatroomsredmatrix2015-09-031-0/+6
| |
* | make js_upload work with hubzilla. It still needs a rewrite.redmatrix2015-09-052-12/+36
| |
* | Fix for PHP Fatal error: Function name must be a string in ↵jeroenpraat2015-09-041-1/+1
| | | | | | | | | | /var/www/hubzilla/include/items.php on line 3325 Please review if this is correct?
* | import and sync chatroomsredmatrix2015-09-034-3/+108
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-5/+7
|\| | | | | | | | | Conflicts: include/identity.php
| * channel export - don't include linked resource items (photos, events). These ↵redmatrix2015-09-031-2/+4
| | | | | | | | items will need to be provided with those objects so that they can be re-linked.
* | app syncredmatrix2015-09-023-2/+91
| |
* | add timestamps for syncing appsredmatrix2015-09-021-3/+10
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-4/+0
|\| | | | | | | | | | | Conflicts: doc/credits.bb mod/thing.php
| * Update the creditsredmatrix2015-09-021-4/+0
| |
| * protect from sql injectionredmatrix2015-09-021-1/+1
| |