aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-0613-117/+114
|\
| * prohibit some photo album edit operations until we figure out how to sync the...redmatrix2015-08-051-20/+31
| * don't throw errors or do the wrong thing if photos have no album (placed on y...redmatrix2015-08-052-9/+14
| * photo album is decided in dav or attach modules now - don't set it in photos_...redmatrix2015-08-051-8/+8
| * uploaded photo from dav (file put, not dav create) not showing in photo albumredmatrix2015-08-051-1/+1
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-052-7/+10
| |\
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-052-1465/+1379
| | |\
| | | * Update Dutch stringsjeroenpraat2015-08-052-1465/+1379
| | * | connection filter fixesredmatrix2015-08-052-7/+10
| | |/
| * | personal oembed black/white listredmatrix2015-08-042-0/+30
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-042-1/+4
| |\|
| | * unobscure item before applying connection filterredmatrix2015-08-042-1/+4
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-033-3/+4
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-032-1354/+1266
| | |\
| | | * Merge pull request #382 from tuscanhobbit/masterPaolo T2015-08-032-1354/+1266
| | | |\
| | | | * Italian translationPaolo Tacconi2015-08-032-1354/+1266
| | * | | these were some really difficult bugs to findredmatrix2015-08-033-4/+3
| | |/ /
| * | | more work separating Diaspora from coreredmatrix2015-08-036-70/+14
* | | | Hubzilla addons addedHaakon Meland Eriksen2015-08-031-0/+5
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-0319-3273/+209
|\| | |
| * | | 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
| |\| |
| | * | 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
| |\| |
| | * | minor cleanupredmatrix2015-07-291-14/+1
| | * | Merge branch 'vobject'redmatrix2015-07-291-23/+83
| | |\ \
| | | * | 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 autho...redmatrix2015-07-283-3/+3
| * | | incorrect function nameredmatrix2015-07-292-2/+2
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 18:47:06 +0000