| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-12 | 1 | -0/+4 |
| |\| |
|
| * | | resolve conflict | redmatrix | 2015-08-11 | 1 | -56/+6 |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -0/+51 |
| |\| |
|
| | * | convert abook_flags from hubzilla during cloning | redmatrix | 2015-08-10 | 1 | -4/+30 |
| * | | bring back colour to abook_self in acl | redmatrix | 2015-08-11 | 1 | -4/+4 |
| * | | photo permission inheritance. We want to use the folder permissions unless sp... | redmatrix | 2015-08-06 | 1 | -0/+17 |
| * | | prohibit some photo album edit operations until we figure out how to sync the... | redmatrix | 2015-08-05 | 1 | -20/+31 |
| * | | don't throw errors or do the wrong thing if photos have no album (placed on y... | redmatrix | 2015-08-05 | 1 | -8/+13 |
| * | | more work separating Diaspora from core | redmatrix | 2015-08-03 | 2 | -27/+1 |
| * | | begin moving diaspora to plugin | redmatrix | 2015-08-02 | 2 | -127/+0 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-31 | 1 | -1/+1 |
| |\| |
|
| | * | consistency of event form | redmatrix | 2015-07-31 | 1 | -1/+1 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -3/+3 |
| |\| |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -2/+16 |
| |\| |
|
| | * | crude but more or less functional event import from thunderbird ics files | redmatrix | 2015-07-26 | 1 | -2/+16 |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-26 | 1 | -2/+2 |
| |\ \ |
|
| | * | | 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 | 1 | -15/+4 |
| |\ \ \
| |/ /
|/| /
| |/ |
|
| | * | 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 | 1 | -0/+4 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -2/+1 |
| |\| |
|
| | * | event privacy issue | redmatrix | 2015-07-23 | 1 | -2/+1 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 1 | -0/+1 |
| |\| |
|
| | * | provide content-disposition for exported ics file | redmatrix | 2015-07-20 | 1 | -0/+1 |
| | * | provide a way to export a single year of items (to potentially keep from exha... | redmatrix | 2015-07-16 | 1 | -1/+9 |
| * | | the view_photos and post_photos permissions are redundant and are now mapped ... | redmatrix | 2015-07-19 | 4 | -9/+6 |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-18 | 1 | -2/+2 |
| |\ \ |
|
| | * | | make likes/dislikes work again | Mario Vavti | 2015-07-17 | 1 | -2/+2 |
| * | | | provide any single year of exported items | redmatrix | 2015-07-16 | 1 | -2/+12 |
| |/ / |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -1/+1 |
| |\| |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -4/+5 |
| |\| |
|
| | * | provide info text for automatic permissions | Mario Vavti | 2015-07-15 | 1 | -1/+1 |
| | * | whitespace | Mario Vavti | 2015-07-15 | 1 | -4/+0 |
| | * | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 1 | -2/+7 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+1 |
| |\| |
|
| | * | fix import of group members | redmatrix | 2015-07-14 | 1 | -1/+1 |
| * | | group fixes to import | redmatrix | 2015-07-14 | 1 | -4/+14 |
| * | | more stuff to resume failed imports | redmatrix | 2015-07-14 | 1 | -1/+13 |
| * | | log the import progress | redmatrix | 2015-07-14 | 1 | -3/+9 |
| * | | provide resumable imports if things go wrong | redmatrix | 2015-07-14 | 1 | -285/+329 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 3 | -81/+46 |
| |\| |
|
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-14 | 1 | -80/+44 |
| | |\ |
|
| | | * | make strings translateable | Mario Vavti | 2015-07-14 | 1 | -0/+6 |
| | | * | revert provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | * | remove dbg | Mario Vavti | 2015-07-14 | 1 | -2/+0 |
| | | * | provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+3 |
| | | * | cleanup connedit | Mario Vavti | 2015-07-14 | 1 | -80/+38 |
| | * | | coverup and ignore the illegal string offset message that some sites have bee... | redmatrix | 2015-07-14 | 1 | -1/+1 |
| | |/ |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-13 | 1 | -1/+0 |
| |\ \ |
|
| | * \ | merge | Mario Vavti | 2015-07-11 | 1 | -1/+4 |
| | |\ \ |
|
