aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #38 from MicMee/masterredmatrix2015-09-121-3/+3
|\
| * 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
|\| | | |/ |/|
| * another tactic to deal with orphan hublocs from re-installs, or at least allo...redmatrix2015-09-111-18/+34
* | 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
|\|
| * 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
|\|
| * really fix post filteringzottel2015-09-021-2/+2
* | initial work on obj import, rename import_profile_photo to import_xchan_photo...redmatrix2015-09-011-1/+1
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-231-1/+1
|\|
| * issues with abook sync between hubzilla and redredmatrix2015-08-231-2/+1
* | issues encountered with hubzilla DB changes, zot_refresh and item_drop and hu...redmatrix2015-08-231-3/+3
* | event integration improvementsredmatrix2015-08-191-2/+13
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-141-3/+0
|\|
| * 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
|\|
| * Require comment perms only for own posts, allow senders to deliver comments u...Alexandre Hannud Abdo2015-08-101-1/+11
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-231-1/+2
|\|
| * patch to allow theme based widgetsredmatrix2015-07-231-1/+2
* | typoredmatrix2015-07-191-1/+1
* | abook clone sync - change logic to also unset existing cross-project flags be...redmatrix2015-07-161-16/+8
* | don't including rating stuff from cloned abooksredmatrix2015-07-161-1/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-151-3/+9
|\|
| * fix for empty recip array resulting from a mangled xchanredmatrix2015-07-151-5/+8
* | more clone sync issues across projectsredmatrix2015-07-151-5/+5
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-151-2/+7
|\|
| * clone sync fixes across red/hzredmatrix2015-07-151-2/+7
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-1/+3
|\|
| * coverup and ignore the illegal string offset message that some sites have bee...redmatrix2015-07-141-1/+3
* | incorrect value for hubloc_deleted in zot_get_hublocs() queryredmatrix2015-07-071-1/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-021-1/+0
|\|
| * a few clone sync fixes as well as some work on hubzilla clone sync back to re...redmatrix2015-07-021-0/+22
* | sync abook entries from redmatrixredmatrix2015-07-021-0/+21
|\|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-281-14/+32
|\|
| * no this isn't it. well ok, it's part of it, but not the important part. it's ...redmatrix2015-06-281-14/+31
* | more work on mail flagsredmatrix2015-06-231-1/+1