aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * Require comment perms only for own posts, allow senders to deliver comments ↵Alexandre Hannud Abdo2015-08-101-1/+11
| | | | | | | | using stream perms.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-231-1/+2
|\| | | | | | | | | Conflicts: include/diaspora.php
| * 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 ↵redmatrix2015-07-161-16/+8
| | | | | | | | besides just setting them
* | 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
|\| | | | | | | | | Conflicts: include/zot.php
| * 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
|\| | | | | | | | | Conflicts: mod/connedit.php
| * coverup and ignore the illegal string offset message that some sites have ↵redmatrix2015-07-141-1/+3
| | | | | | | | been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
* | 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
|\| | | | | | | | | Conflicts: include/zot.php
| * a few clone sync fixes as well as some work on hubzilla clone sync back to ↵redmatrix2015-07-021-0/+22
| | | | | | | | redmatrix
* | sync abook entries from redmatrixredmatrix2015-07-021-0/+21
|\| | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-281-14/+32
|\| | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po
| * no this isn't it. well ok, it's part of it, but not the important part. it's ↵redmatrix2015-06-281-14/+31
| | | | | | | | still pretty cool.
* | 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
|\| | | | | | | | | Conflicts: mod/impel.php
| * some work on issue #329redmatrix2015-05-251-3/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-201-16/+5
|\| | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
| * cloning abook entries was broken in several ways if the target xchan wasn't ↵redmatrix2015-05-201-16/+5
| | | | | | | | available on the clone site. This should make it less broken.
* | re-arrange the html cache a bitredmatrix2015-05-201-0/+3
| |
* | Merge branch 'master' into tresredmatrix2015-05-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * Some documentation and whitespaces at line endings.Klaus Weidenbach2015-04-101-223/+325
| |
| * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-413/+380
| | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
| * tweaks to directory registrations which don't seem to be happening, also ↵friendica2015-03-191-0/+14
| | | | | | | | downgrade any directory that claims to be a primary directory for RED_GLOBAL.
| * add missing %d for abook_closenessMichael Johnston2015-03-111-1/+1
| |