Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more file permissions inheritance work | redmatrix | 2015-08-06 | 1 | -4/+11 |
| | |||||
* | photo permission inheritance. We want to use the folder permissions unless ↵ | redmatrix | 2015-08-06 | 5 | -24/+73 |
| | | | | specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty. | ||||
* | don't throw errors or do the wrong thing if photos have no album (placed on ↵ | redmatrix | 2015-08-05 | 1 | -1/+1 |
| | | | | your dav rootdir) | ||||
* | photo album is decided in dav or attach modules now - don't set it in ↵ | redmatrix | 2015-08-05 | 1 | -8/+8 |
| | | | | photos_upload | ||||
* | uploaded photo from dav (file put, not dav create) not showing in photo album | redmatrix | 2015-08-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-05 | 1 | -6/+9 |
|\ | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | connection filter fixes | redmatrix | 2015-08-05 | 1 | -6/+9 |
| | | |||||
* | | personal oembed black/white list | redmatrix | 2015-08-04 | 2 | -0/+30 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-04 | 1 | -0/+3 |
|\| | |||||
| * | unobscure item before applying connection filter | redmatrix | 2015-08-04 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-03 | 2 | -2/+3 |
|\| | | | | | | | | | | | Conflicts: view/it/messages.po view/it/strings.php | ||||
| * | these were some really difficult bugs to find | redmatrix | 2015-08-03 | 2 | -3/+2 |
| | | |||||
* | | more work separating Diaspora from core | redmatrix | 2015-08-03 | 2 | -19/+13 |
| | | |||||
* | | diaspora_meta getting double json encoded | redmatrix | 2015-08-02 | 1 | -1/+1 |
| | | |||||
* | | begin moving diaspora to plugin | redmatrix | 2015-08-02 | 2 | -3039/+8 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-31 | 2 | -3/+22 |
|\| | | | | | | | | | Conflicts: util/messages.po | ||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 7 | -87/+125 |
|\| | | | | | | | | | | | 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 | 1 | -0/+1 |
| |/ | |||||
| * | make superblock block a channel if it's an owner as well as the current ↵ | redmatrix | 2015-07-28 | 2 | -2/+2 |
| | | | | | | | | 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 | 2 | -5/+88 |
|\| | | | | | | | | | Conflicts: util/messages.po | ||||
| * | logic issue in connection filter | redmatrix | 2015-07-27 | 1 | -4/+3 |
| | | |||||
| * | crude but more or less functional event import from thunderbird ics files | redmatrix | 2015-07-26 | 1 | -6/+25 |
| | | |||||
| * | backend code for importing events from "simple" ics calendar files. | redmatrix | 2015-07-26 | 1 | -0/+65 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 3 | -2/+8 |
|\| | | | | | | | | | Conflicts: include/diaspora.php | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-23 | 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 | 3 | -2/+7 |
| |/ | |||||
* | | 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 | 5 | -8/+17 |
|\| | | | | | | | | | Conflicts: doc/to_do_code.bb | ||||
| * | ics calendar export - commas need to be escaped | redmatrix | 2015-07-21 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-20 | 3 | -8/+8 |
| |\ | |||||
| | * | Fixes regarding the new default profile photo size. The default profile ↵ | Mario Vavti | 2015-07-20 | 3 | -8/+8 |
| | | | | | | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. | ||||
| * | | 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. | ||||
| * | allow per-connection content filter to specify a detected language to ↵ | redmatrix | 2015-07-20 | 1 | -0/+6 |
| | | | | | | | | 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 | 3 | -6/+6 |
|\| | | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-16 | 1 | -5/+5 |
| |\ | |||||
| | * | fix missing div and a regression introduced in ↵ | Mario Vavti | 2015-07-16 | 1 | -5/+5 |
| | | | | | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos |