aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | delivery reports - crude but mostly functional at least for zot deliveriesredmatrix2015-09-221-3/+4
| |
* | heavy lifting for delivery reportsredmatrix2015-09-221-1/+11
| |
* | more progress on delivery reports. Store the remote results from zot sites ↵redmatrix2015-09-211-0/+15
| | | | | | | | locally.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-13/+34
|\| | | | | | | | | Conflicts: include/zot.php
| * new delivery report formatredmatrix2015-09-201-13/+33
| |
* | 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-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-181-0/+2
| |
* | more work on surviving hub re-installsredmatrix2015-09-181-2/+6
| |
* | consolidate zotfinger and webfingerredmatrix2015-09-171-0/+288
| |
* | 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-111-18/+34
|\| | | |/ |/| | | | | Conflicts: util/messages.po
| * another tactic to deal with orphan hublocs from re-installs, or at least ↵redmatrix2015-09-111-18/+34
| | | | | | | | allow the descendant channel to survive
* | sync likesredmatrix2015-09-101-0/+3
| |
* | 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
| |
| * protect from sql injectionredmatrix2015-09-021-1/+1
| |
* | menu import and syncredmatrix2015-09-081-0/+3
| |
* | work on event syncredmatrix2015-09-071-1/+7
| |
* | consolidate import_items/sync_itemsredmatrix2015-09-071-0/+6
| |
* | import and sync chatroomsredmatrix2015-09-031-0/+3
| |
* | app syncredmatrix2015-09-021-0/+2
| |
* | start to modularise the clone import and sync functionsredmatrix2015-09-021-0/+6
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-4/+3
|\| | | | | | | | | Conflicts: include/zot.php
| * really fix post filteringzottel2015-09-021-2/+2
| |
* | initial work on obj import, rename import_profile_photo to ↵redmatrix2015-09-011-1/+1
| | | | | | | | import_xchan_photo to more accurately state its purpose.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-231-1/+1
|\| | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po
| * issues with abook sync between hubzilla and redredmatrix2015-08-231-2/+1
| |
* | issues encountered with hubzilla DB changes, zot_refresh and item_drop and ↵redmatrix2015-08-231-3/+3
| | | | | | | | hub sync
* | event integration improvementsredmatrix2015-08-191-2/+13
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-141-3/+0
|\| | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| * Properly fix which perms get checked for comments, Mike's solutionAlexandre Hannud Abdo2015-08-141-14/+3
| |
| * revert 36b5f6acredmatrix2015-08-121-12/+14
| |
* | add item validation functionredmatrix2015-08-131-19/+8
| |
* | reverting 36b5f6acredmatrix2015-08-121-11/+18
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-111-1/+11
|\| | | | | | | | | | | Conflicts: doc/history.md mod/import.php