| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -1/+5 |
| |\ | | | | | | | | | Conflicts: include/identity.php | ||||
| | * | provide ability to export by month as well as by year | redmatrix | 2015-08-17 | 1 | -1/+5 |
| | | | |||||
| * | | issues encountered whilst testing import_items module using yearly dump files | redmatrix | 2015-08-17 | 1 | -2/+1 |
| | | | |||||
| * | | provide module for importing yearly content dumps | redmatrix | 2015-08-17 | 1 | -0/+173 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 1 | -7/+7 |
| |\| | |||||
| | * | issue #386 - account and channel bulk edit checkboxes not visible and ↵ | redmatrix | 2015-08-16 | 1 | -7/+7 |
| | | | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation. | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 1 | -2/+3 |
| |\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| | * | set email verified if lost password workflow is completed to avoid the ↵ | redmatrix | 2015-08-14 | 1 | -2/+3 |
| | | | | | | | | | situation where they can reset the password but still not be able to login because the original email verification was lost. | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-12 | 1 | -0/+4 |
| |\| | | | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl | ||||
| * | | 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 |
| |\| | | | | | | | | | | | Conflicts: doc/history.md mod/import.php | ||||
| | * | 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 ↵ | redmatrix | 2015-08-06 | 1 | -0/+17 |
| | | | | | | | | | 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. | ||||
| * | | prohibit some photo album edit operations until we figure out how to sync ↵ | redmatrix | 2015-08-05 | 1 | -20/+31 |
| | | | | | | | | | them with dav | ||||
| * | | don't throw errors or do the wrong thing if photos have no album (placed on ↵ | redmatrix | 2015-08-05 | 1 | -8/+13 |
| | | | | | | | | | your dav rootdir) | ||||
| * | | 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 |
| |\| | | | | | | | | | Conflicts: util/messages.po | ||||
| | * | 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 |
| |\| | | | | | | | | | | | several dav fixes Conflicts: include/items.php | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -2/+16 |
| |\| | | | | | | | | | Conflicts: util/messages.po | ||||
| | * | 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 |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | 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 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -2/+1 |
| |\| | | | | | | | | | Conflicts: include/diaspora.php | ||||
| | * | 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 |
| |\| | | | | | | | | | Conflicts: doc/to_do_code.bb | ||||
| | * | 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 ↵ | redmatrix | 2015-07-16 | 1 | -1/+9 |
| | | | | | | | | | exhausting resources either on export or import) | ||||
| * | | the view_photos and post_photos permissions are redundant and are now mapped ↵ | redmatrix | 2015-07-19 | 4 | -9/+6 |
| | | | | | | | | | to view_storage and write_storage | ||||
| * | | 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 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | | 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 |
| |\| | | | | | | | | | Conflicts: mod/import.php | ||||
| | * | 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 |
| |\| | | | | | | | | | Conflicts: mod/connedit.php | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-14 | 1 | -80/+44 |
| | |\ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |