aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-07-2997-1293/+1407
|\
| * 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
| |\|
| | * 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 unused varMario Vavti2015-07-251-2/+2
| | |/ / /
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-262-15/+13
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | 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 stringsAlexandre Hannud Abdo2015-07-242-3156/+3297
| | |/
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-236-6/+10
| |\|
| | * 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 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 messa...redmatrix2015-07-223-4/+36
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-2124-29/+48
| |\|
| | * 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 photo...Mario Vavti2015-07-2017-9/+9
| | | * show icons instead of disabled checkboxesMario Vavti2015-07-201-2/+7
| | * | there is no stricmp() in php, use strcasecmp() - also only detect language if...redmatrix2015-07-201-3/+6
| | * | indicate where progress has been maderedmatrix2015-07-202-16/+20
| | |/
| | * allow per-connection content filter to specify a detected language to include...redmatrix2015-07-202-1/+7
| * | silence warning about non array diaspora_meta but report it in the logs so we...redmatrix2015-07-191-1/+3
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-196-52/+50
| |\|
| | * 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 ec23a94b6d7f6db1e1d34275b8143c...Mario Vavti2015-07-162-50/+37
| | | * Merge pull request #376 from tuscanhobbit/masterPaolo T2015-07-162-305/+369
| | | |\
| | | | * Updated Italian stringsPaolo Tacconi2015-07-162-305/+369
| | * | | provide a way to export a single year of items (to potentially keep from exha...redmatrix2015-07-163-3/+40
| | |/ /
| | * | allow plugins to provide module handlers for arbitrary modules that haven't b...redmatrix2015-07-152-0/+13
| * | | typoredmatrix2015-07-191-1/+1
| * | | the view_photos and post_photos permissions are redundant and are now mapped ...redmatrix2015-07-1910-74/+36
| * | | 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 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 be...redmatrix2015-07-161-16/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 14:13:23 +0000