aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* more work separating Diaspora from coreredmatrix2015-08-036-70/+14
|
* diaspora_meta getting double json encodedredmatrix2015-08-021-1/+1
|
* begin moving diaspora to pluginredmatrix2015-08-024-3166/+8
|
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-021-1/+1
|\
| * revision updateredmatrix2015-08-021-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-315-6/+25
|\| | | | | | | | | Conflicts: util/messages.po
| * consistency of event formredmatrix2015-07-314-213/+198
| |
| * event parse cleanupredmatrix2015-07-301-2/+8
| |
| * escape $ in eventsredmatrix2015-07-302-3/+16
| |
* | undefined functionredmatrix2015-07-301-0/+1
| |
* | minor - add all the newly supported table columnsredmatrix2015-07-301-2/+2
| |
* | incorrect photo permissions when uploaded via /cloud; issue #21redmatrix2015-07-301-0/+11
| |
* | make /cloud work again after all the shuffling this morningredmatrix2015-07-303-9/+14
| |
* | update some of the old attach.flag values to the new schemaredmatrix2015-07-301-1/+16
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-303-3/+8
|\|
| * dummy updateredmatrix2015-07-303-3/+8
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-309-91/+129
|\| | | | | | | | | | | several dav fixes Conflicts: include/items.php
| * minor cleanupredmatrix2015-07-291-14/+1
| |
| * Merge branch 'vobject'redmatrix2015-07-291-23/+83
| |\ | | | | | | | | | | | | Conflicts: include/event.php
| | * convert ics import to sabre/vobjectredmatrix2015-07-291-29/+42
| | |
| | * initial work on using sabre as a vcalendar parserredmatrix2015-07-281-1/+50
| | |
| * | add connection filter to non-zot postsredmatrix2015-07-292-0/+8
| | |
| * | PRIVACY: imported eventsredmatrix2015-07-292-1/+2
| |/
| * make superblock block a channel if it's an owner as well as the current ↵redmatrix2015-07-283-3/+3
| | | | | | | | author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 08:01:32 +0000