aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-272-5/+88
|\ | | | | | | | | Conflicts: util/messages.po
| * logic issue in connection filterredmatrix2015-07-271-4/+3
| |
| * crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-261-6/+25
| |
| * backend code for importing events from "simple" ics calendar files.redmatrix2015-07-261-0/+65
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-233-2/+8
|\| | | | | | | | | Conflicts: include/diaspora.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-231-1/+1
| |\
| | * make content filter by language work for excludeszottel2015-07-221-1/+1
| | |
| * | patch to allow theme based widgetsredmatrix2015-07-233-2/+7
| |/
* | refresh diaspora xchan every month or so since receiving profile update ↵redmatrix2015-07-223-4/+36
| | | | | | | | messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-215-8/+17
|\| | | | | | | | | Conflicts: doc/to_do_code.bb
| * ics calendar export - commas need to be escapedredmatrix2015-07-211-1/+1
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-203-8/+8
| |\
| | * Fixes regarding the new default profile photo size. The default profile ↵Mario Vavti2015-07-203-8/+8
| | | | | | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
| * | there is no stricmp() in php, use strcasecmp() - also only detect language ↵redmatrix2015-07-201-3/+6
| |/ | | | | | | if we plan to use it.
| * allow per-connection content filter to specify a detected language to ↵redmatrix2015-07-201-0/+6
| | | | | | | | include/exclude (in addition to text, tags, and regexes)
* | silence warning about non array diaspora_meta but report it in the logs so ↵redmatrix2015-07-191-1/+3
| | | | | | | | we can find out what it actually is and why.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-193-6/+6
|\| | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-161-5/+5
| |\
| | * fix missing div and a regression introduced in ↵Mario Vavti2015-07-161-5/+5
| | | | | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos
| * | provide a way to export a single year of items (to potentially keep from ↵redmatrix2015-07-161-1/+30
| |/ | | | | | | exhausting resources either on export or import)
| * allow plugins to provide module handlers for arbitrary modules that haven't ↵redmatrix2015-07-151-0/+2
| | | | | | | | been installed on the system.
* | typoredmatrix2015-07-191-1/+1
| |
* | the view_photos and post_photos permissions are redundant and are now mapped ↵redmatrix2015-07-194-56/+30
| | | | | | | | to view_storage and write_storage
* | some photo/attach permissions issuesredmatrix2015-07-181-12/+22
| |
* | provide any single year of exported itemsredmatrix2015-07-162-3/+35
| |
* | 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
| |
* | fix observer tags for now (issue #17)zottel2015-07-161-1/+1
| |
* | since we've got a fresh start without a lot of legacy sites to support, ↵redmatrix2015-07-151-1/+2
| | | | | | | | provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided.
* | make tagadelic results (including categories in wall-to-wall posts) visible ↵redmatrix2015-07-153-11/+17
| | | | | | | | to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree.
* | 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-0/+6
|\|
| * stream_perms_xchans() set to empty quoted string when no results rather than ↵redmatrix2015-07-141-0/+6
| | | | | | | | return an empty string
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-142-2/+4
|\| | | | | | | | | Conflicts: mod/connedit.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-142-1/+19
| |\
| | * cleanup conneditMario Vavti2015-07-141-1/+1
| | |
| * | 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.
* | | merge from redmatrixredmatrix2015-07-131-1/+1
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-132-1/+23
|\ \ \ | | |/ | |/|
| * | change account_default_channel if default channel is removedzottel2015-07-131-0/+18
| |/
| * Only let local logins install webpage elementsredmatrix2015-07-111-1/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-102-2/+2
|\| | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
| * increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-091-1/+1
| |
| * fix typo to make directory safe mode default to on work againMario Vavti2015-07-081-1/+1
| |
* | inconsistent naming of block item typesredmatrix2015-07-081-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-073-46/+21
|\|