| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | more work separating Diaspora from core | redmatrix | 2015-08-03 | 6 | -70/+14 | |
| | | | | ||||||
| * | | | diaspora_meta getting double json encoded | redmatrix | 2015-08-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | begin moving diaspora to plugin | redmatrix | 2015-08-02 | 4 | -3166/+8 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-02 | 1 | -1/+1 | |
| |\| | | ||||||
| | * | | revision update | redmatrix | 2015-08-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-31 | 5 | -6/+25 | |
| |\| | | | | | | | | | | | | | | Conflicts: util/messages.po | |||||
| | * | | consistency of event form | redmatrix | 2015-07-31 | 4 | -213/+198 | |
| | | | | ||||||
| | * | | event parse cleanup | redmatrix | 2015-07-30 | 1 | -2/+8 | |
| | | | | ||||||
| | * | | escape $ in events | redmatrix | 2015-07-30 | 2 | -3/+16 | |
| | | | | ||||||
| * | | | undefined function | redmatrix | 2015-07-30 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | minor - add all the newly supported table columns | redmatrix | 2015-07-30 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | incorrect photo permissions when uploaded via /cloud; issue #21 | redmatrix | 2015-07-30 | 1 | -0/+11 | |
| | | | | ||||||
| * | | | make /cloud work again after all the shuffling this morning | redmatrix | 2015-07-30 | 3 | -9/+14 | |
| | | | | ||||||
| * | | | 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 | |
| |\| | | | | | | | | | | | | | | | | | several dav fixes Conflicts: include/items.php | |||||
| | * | | minor cleanup | redmatrix | 2015-07-29 | 1 | -14/+1 | |
| | | | | ||||||
| | * | | Merge branch 'vobject' | redmatrix | 2015-07-29 | 1 | -23/+83 | |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: include/event.php | |||||
| | | * | | 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 ↵ | redmatrix | 2015-07-28 | 3 | -3/+3 | |
| | | | | | | | | | | | | | author; add @hostname to event hashes to make their use in vcalendar more RFC compliant | |||||
| * | | | 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 | |
| |\| | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |