aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* incorrect function nameredmatrix2015-07-292-2/+2
|
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-271-6/+5
|\
| * align buttons on event calendarredmatrix2015-07-271-6/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-275-8/+118
|\| | | | | | | | | Conflicts: util/messages.po
| * logic issue in connection filterredmatrix2015-07-272-5/+4
| |
| * crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-263-8/+54
| |
| * backend code for importing events from "simple" ics calendar files.redmatrix2015-07-261-0/+65
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-264-3171/+3325
| |\
| * | revision and string updateredmatrix2015-07-262-30/+34
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-261-2/+2
|\ \ \
| * \ \ Merge pull request #22 from git-marijus/masterredmatrix2015-07-261-2/+2
| |\ \ \ | | | | | | | | | | fix abook_pending reset to 1 loop if $new_friend is false and remove …
| | * | | fix abook_pending reset to 1 loop if $new_friend is false and remove unused varMario Vavti2015-07-251-2/+2
| |/ / /
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-262-15/+13
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | Conflicts: mod/connedit.php view/pt-br/messages.po view/pt-br/strings.php
| * | comment out some popover infos - we provide enough visual feedback nowMario Vavti2015-07-261-15/+15
| | |
| * | Provide connection status if status is "a-normal"Mario Vavti2015-07-262-0/+13
| | |
| * | Merge pull request #378 from solstag/ptbrupdategit-marijus2015-07-252-3156/+3297
| |\ \ | | |/ | |/| update pt-br strings
| | * update pt-br stringsAlexandre Hannud Abdo2015-07-242-3156/+3297
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-236-6/+10
|\| | | | | | | | | Conflicts: include/diaspora.php
| * event privacy issueredmatrix2015-07-231-2/+1
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-231-1/+1
| |\
| | * Merge pull request #377 from zzottel/masterredmatrix2015-07-221-1/+1
| | |\ | | | | | | | | make content filter by language work for excludes
| | | * make content filter by language work for excludeszottel2015-07-221-1/+1
| | |/
| * / patch to allow theme based widgetsredmatrix2015-07-235-4/+8
| |/
* | 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-2124-29/+48
|\| | | | | | | | | Conflicts: doc/to_do_code.bb
| * ics calendar export - commas need to be escapedredmatrix2015-07-212-2/+2
| |
| * provide content-disposition for exported ics fileredmatrix2015-07-201-0/+1
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-2018-11/+16
| |\
| | * Fixes regarding the new default profile photo size. The default profile ↵Mario Vavti2015-07-2017-9/+9
| | | | | | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
| | * show icons instead of disabled checkboxesMario Vavti2015-07-201-2/+7
| | |
| * | there is no stricmp() in php, use strcasecmp() - also only detect language ↵redmatrix2015-07-201-3/+6
| | | | | | | | | | | | if we plan to use it.
| * | indicate where progress has been maderedmatrix2015-07-202-16/+20
| |/
| * allow per-connection content filter to specify a detected language to ↵redmatrix2015-07-202-1/+7
| | | | | | | | 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-196-52/+50
|\| | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php
| * string updateredmatrix2015-07-192-986/+926
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-164-355/+406
| |\
| | * fix missing div and a regression introduced in ↵Mario Vavti2015-07-162-50/+37
| | | | | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos
| | * Merge pull request #376 from tuscanhobbit/masterPaolo T2015-07-162-305/+369
| | |\ | | | | | | | | Updated Italian strings
| | | * Updated Italian stringsPaolo Tacconi2015-07-162-305/+369
| | | |
| * | | provide a way to export a single year of items (to potentially keep from ↵redmatrix2015-07-163-3/+40
| |/ / | | | | | | | | | exhausting resources either on export or import)
| * | allow plugins to provide module handlers for arbitrary modules that haven't ↵redmatrix2015-07-152-0/+13
| | | | | | | | | | | | 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-1910-74/+36
| | | | | | | | | | | | to view_storage and write_storage
* | | some photo/attach permissions issuesredmatrix2015-07-181-12/+22
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-181-2/+2
|\ \ \
| * \ \ Merge pull request #20 from git-marijus/masterredmatrix2015-07-191-2/+2
| |\ \ \ | | | | | | | | | | make likes/dislikes work again
| | * | | make likes/dislikes work againMario Vavti2015-07-171-2/+2
| |/ / /
* / / / provide any single year of exported itemsredmatrix2015-07-163-5/+47
|/ / /
* | | abook clone sync - change logic to also unset existing cross-project flags ↵redmatrix2015-07-161-16/+8
| | | | | | | | | | | | besides just setting them