| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | | | update some of the old attach.flag values to the new schema | redmatrix | 2015-07-30 | 1 | -1/+16 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 3 | -3/+8 |
| |\| | |
|
| | * | | dummy update | redmatrix | 2015-07-30 | 3 | -3/+8 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 9 | -91/+129 |
| |\| | |
|
| | * | | minor cleanup | redmatrix | 2015-07-29 | 1 | -14/+1 |
| | * | | Merge branch 'vobject' | redmatrix | 2015-07-29 | 1 | -23/+83 |
| | |\ \ |
|
| | | * | | convert ics import to sabre/vobject | redmatrix | 2015-07-29 | 1 | -29/+42 |
| | | * | | initial work on using sabre as a vcalendar parser | redmatrix | 2015-07-28 | 1 | -1/+50 |
| | * | | | add connection filter to non-zot posts | redmatrix | 2015-07-29 | 2 | -0/+8 |
| | * | | | PRIVACY: imported events | redmatrix | 2015-07-29 | 2 | -1/+2 |
| | |/ / |
|
| | * | | make superblock block a channel if it's an owner as well as the current autho... | redmatrix | 2015-07-28 | 3 | -3/+3 |
| * | | | incorrect function name | redmatrix | 2015-07-29 | 2 | -2/+2 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -6/+5 |
| |\| | |
|
| | * | | align buttons on event calendar | redmatrix | 2015-07-27 | 1 | -6/+5 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 5 | -8/+118 |
| |\| | |
|
| | * | | logic issue in connection filter | redmatrix | 2015-07-27 | 2 | -5/+4 |
| | * | | crude but more or less functional event import from thunderbird ics files | redmatrix | 2015-07-26 | 3 | -8/+54 |
| | * | | backend code for importing events from "simple" ics calendar files. | redmatrix | 2015-07-26 | 1 | -0/+65 |
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-26 | 4 | -3171/+3325 |
| | |\ \ |
|
| | * | | | revision and string update | redmatrix | 2015-07-26 | 2 | -30/+34 |
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-26 | 1 | -2/+2 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge pull request #22 from git-marijus/master | redmatrix | 2015-07-26 | 1 | -2/+2 |
| | |\ \ \ \ |
|
| | | * | | | | fix abook_pending reset to 1 loop if $new_friend is false and remove unused var | Mario Vavti | 2015-07-25 | 1 | -2/+2 |
| | |/ / / / |
|
| * | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-26 | 2 | -15/+13 |
| |\ \ \ \ \
| |/ / / /
|/| | / /
| | |/ /
| |/| | |
|
| | * | | | comment out some popover infos - we provide enough visual feedback now | Mario Vavti | 2015-07-26 | 1 | -15/+15 |
| | * | | | Provide connection status if status is "a-normal" | Mario Vavti | 2015-07-26 | 2 | -0/+13 |
| | * | | | Merge pull request #378 from solstag/ptbrupdate | git-marijus | 2015-07-25 | 2 | -3156/+3297 |
| | |\ \ \
| | |/ /
| |/| | |
|
| | | * | | update pt-br strings | Alexandre Hannud Abdo | 2015-07-24 | 2 | -3156/+3297 |
| | |/ / |
|
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 6 | -6/+10 |
| |\| | |
|
| | * | | event privacy issue | redmatrix | 2015-07-23 | 1 | -2/+1 |
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-23 | 1 | -1/+1 |
| | |\ \ |
|
| | | * \ | Merge pull request #377 from zzottel/master | redmatrix | 2015-07-22 | 1 | -1/+1 |
| | | |\ \ |
|
| | | | * | | make content filter by language work for excludes | zottel | 2015-07-22 | 1 | -1/+1 |
| | | |/ / |
|
| | * / / | patch to allow theme based widgets | redmatrix | 2015-07-23 | 5 | -4/+8 |
| | |/ / |
|
| * | | | refresh diaspora xchan every month or so since receiving profile update messa... | redmatrix | 2015-07-22 | 3 | -4/+36 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 24 | -29/+48 |
| |\| | |
|
| | * | | ics calendar export - commas need to be escaped | redmatrix | 2015-07-21 | 2 | -2/+2 |
| | * | | provide content-disposition for exported ics file | redmatrix | 2015-07-20 | 1 | -0/+1 |
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-20 | 18 | -11/+16 |
| | |\ \ |
|
| | | * | | Fixes regarding the new default profile photo size. The default profile photo... | Mario Vavti | 2015-07-20 | 17 | -9/+9 |
| | | * | | show icons instead of disabled checkboxes | Mario Vavti | 2015-07-20 | 1 | -2/+7 |
| | * | | | there is no stricmp() in php, use strcasecmp() - also only detect language if... | redmatrix | 2015-07-20 | 1 | -3/+6 |
| | * | | | indicate where progress has been made | redmatrix | 2015-07-20 | 2 | -16/+20 |
| | |/ / |
|
| | * | | allow per-connection content filter to specify a detected language to include... | redmatrix | 2015-07-20 | 2 | -1/+7 |
| * | | | silence warning about non array diaspora_meta but report it in the logs so we... | redmatrix | 2015-07-19 | 1 | -1/+3 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-19 | 6 | -52/+50 |
| |\| | |
|
| | * | | string update | redmatrix | 2015-07-19 | 2 | -986/+926 |
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-16 | 4 | -355/+406 |
| | |\ \ |
|
| | | * | | fix missing div and a regression introduced in ec23a94b6d7f6db1e1d34275b8143c... | Mario Vavti | 2015-07-16 | 2 | -50/+37 |
| | | * | | Merge pull request #376 from tuscanhobbit/master | Paolo T | 2015-07-16 | 2 | -305/+369 |
| | | |\| |
|
