aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
Commit message (Expand)AuthorAgeFilesLines
* 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
* | item flag fixes discovered after a few mergesredmatrix2015-06-231-2/+1
* | DB changes for some channel flagsredmatrix2015-06-151-16/+13
* | convert the abook fieldsredmatrix2015-06-141-28/+22
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-3/+4
|\|
| * some work on issue #329redmatrix2015-05-251-3/+4
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-201-16/+5
|\|
| * cloning abook entries was broken in several ways if the target xchan wasn't a...redmatrix2015-05-201-16/+5
* | re-arrange the html cache a bitredmatrix2015-05-201-0/+3
* | Merge branch 'master' into tresredmatrix2015-05-141-1/+1
|\ \
| * | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-061-3/+3
| * | first pass name changeredmatrix2015-05-051-1/+1
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-567/+821
|\|
| * Some documentation and whitespaces at line endings.Klaus Weidenbach2015-04-101-223/+325
| * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-413/+380
| * tweaks to directory registrations which don't seem to be happening, also down...friendica2015-03-191-0/+14
| * add missing %d for abook_closenessMichael Johnston2015-03-111-1/+1
| * diaspora's spammy permission model seems to have leaked through our firehose....friendica2015-03-101-2/+5
| * change default affinity (abook_closeness) to 80 for all new connections going...friendica2015-03-081-1/+7
| * I'm going to use the site_update timestamp to indicate whenever we successful...friendica2015-03-031-0/+15
| * don't let a zot-finger bring a dead hub back to life unless it's the site we'...friendica2015-03-031-5/+7
| * make public delivery to contacts or any connections work againzottel2015-03-021-3/+2
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-261-0/+3
| |\
| | * more fake null shenanigansHabeas Codice2015-02-261-0/+3
| | * Revert "more fake null shenanigans"Habeas Codice2015-02-261-23/+94