| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-07-29 | 97 | -1293/+1407 |
| |\ | |||||
| | * | 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 |
| | |\| | | | | | | | | | | | | | Conflicts: util/messages.po | ||||
| | | * | 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 … | ||||
| | | | * | | | 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 |
| | |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | Conflicts: mod/connedit.php view/pt-br/messages.po view/pt-br/strings.php | ||||
| | | * | | 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 | ||||
| | | | * | 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 |
| | |\| | | | | | | | | | | | | | Conflicts: include/diaspora.php | ||||
| | | * | 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 | ||||
| | | | | * | 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 ↵ | redmatrix | 2015-07-22 | 3 | -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/redmatrix | redmatrix | 2015-07-21 | 24 | -29/+48 |
| | |\| | | | | | | | | | | | | | Conflicts: doc/to_do_code.bb | ||||
| | | * | 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 ↵ | Mario Vavti | 2015-07-20 | 17 | -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 checkboxes | Mario Vavti | 2015-07-20 | 1 | -2/+7 |
| | | | | | |||||
| | | * | | there is no stricmp() in php, use strcasecmp() - also only detect language ↵ | redmatrix | 2015-07-20 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | if we plan to use it. | ||||
| | | * | | indicate where progress has been made | redmatrix | 2015-07-20 | 2 | -16/+20 |
| | | |/ | |||||
| | | * | allow per-connection content filter to specify a detected language to ↵ | redmatrix | 2015-07-20 | 2 | -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 ↵ | redmatrix | 2015-07-19 | 1 | -1/+3 |
| | | | | | | | | | | | | | we can find out what it actually is and why. | ||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-19 | 6 | -52/+50 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php | ||||
| | | * | 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 ↵ | Mario Vavti | 2015-07-16 | 2 | -50/+37 |
| | | | | | | | | | | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos | ||||
| | | | * | Merge pull request #376 from tuscanhobbit/master | Paolo T | 2015-07-16 | 2 | -305/+369 |
| | | | |\ | | | | | | | | | | | Updated Italian strings | ||||
| | | | | * | Updated Italian strings | Paolo Tacconi | 2015-07-16 | 2 | -305/+369 |
| | | | | | | |||||
| | | * | | | provide a way to export a single year of items (to potentially keep from ↵ | redmatrix | 2015-07-16 | 3 | -3/+40 |
| | | |/ / | | | | | | | | | | | | | exhausting resources either on export or import) | ||||
| | | * | | allow plugins to provide module handlers for arbitrary modules that haven't ↵ | redmatrix | 2015-07-15 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | been installed on the system. | ||||
| | * | | | typo | redmatrix | 2015-07-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | the view_photos and post_photos permissions are redundant and are now mapped ↵ | redmatrix | 2015-07-19 | 10 | -74/+36 |
| | | | | | | | | | | | | | | | | | to view_storage and write_storage | ||||
| | * | | | some photo/attach permissions issues | redmatrix | 2015-07-18 | 1 | -12/+22 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-18 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #20 from git-marijus/master | redmatrix | 2015-07-19 | 1 | -2/+2 |
| | | |\ \ \ | | | | | | | | | | | | | make likes/dislikes work again | ||||
| | | | * | | | make likes/dislikes work again | Mario Vavti | 2015-07-17 | 1 | -2/+2 |
| | | |/ / / | |||||
| | * / / / | provide any single year of exported items | redmatrix | 2015-07-16 | 3 | -5/+47 |
| | |/ / / | |||||
| | * | | | abook clone sync - change logic to also unset existing cross-project flags ↵ | redmatrix | 2015-07-16 | 1 | -16/+8 |
| | | | | | | | | | | | | | | | | | besides just setting them | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |