| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+0 |
| |\ | | | | | | | | | Conflicts: mod/import.php | ||||
| | * | syntax error in last checkin | redmatrix | 2015-08-26 | 1 | -4/+4 |
| | | | |||||
| | * | import fixes | redmatrix | 2015-08-26 | 1 | -1/+33 |
| | | | |||||
| * | | import fixes | redmatrix | 2015-08-26 | 1 | -2/+15 |
| | | | |||||
| * | | add repository type as one that is able to self-identify as a public forum | redmatrix | 2015-08-25 | 1 | -1/+1 |
| | | | |||||
| * | | this is weird | redmatrix | 2015-08-25 | 1 | -200/+186 |
| | | | |||||
| * | | make diaspora person guids for hubzilla folks globally unique. That's what a ↵ | redmatrix | 2015-08-25 | 1 | -1/+1 |
| | | | | | | | | | globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision. | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-24 | 1 | -137/+0 |
| |\| | | | | | | | | | | | Conflicts: mod/connections.php mod/connedit.php | ||||
| | * | remove orphan mod_connections editing code (now done in mod/connedit) | redmatrix | 2015-08-24 | 2 | -140/+12 |
| | | | |||||
| * | | edited event showing bad signature and null_date for edit timestamp | redmatrix | 2015-08-24 | 1 | -0/+5 |
| | | | |||||
| * | | sync abook flags in memory after altering them | redmatrix | 2015-08-23 | 1 | -0/+11 |
| | | | |||||
| * | | change name of module | redmatrix | 2015-08-22 | 3 | -6/+8 |
| | | | |||||
| * | | restrict event notification to events and birthdays (exclude tasks) | redmatrix | 2015-08-22 | 1 | -0/+2 |
| | | | |||||
| * | | cleanup of task widget - make jquery workflow a bit smoother | redmatrix | 2015-08-20 | 1 | -22/+32 |
| | | | |||||
| * | | more work on tasks | redmatrix | 2015-08-20 | 2 | -9/+25 |
| | | | |||||
| * | | We don't need photos to also include attachments. It's interesting, but not ↵ | redmatrix | 2015-08-20 | 1 | -0/+1 |
| | | | | | | | | | all that useful. | ||||
| * | | some event related fixes and some base work for implementing native tasks ↵ | redmatrix | 2015-08-20 | 2 | -10/+99 |
| | | | | | | | | | (to-do lists); which should already be importable and exportable. | ||||
| * | | do ical export before checking logged in channel | redmatrix | 2015-08-20 | 1 | -23/+21 |
| | | | |||||
| * | | check perms on ical attachments | redmatrix | 2015-08-19 | 1 | -3/+6 |
| | | | |||||
| * | | event integration improvements | redmatrix | 2015-08-19 | 2 | -1/+31 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-18 | 1 | -1/+1 |
| |\| | |||||
| | * | add month to export filename when using month | redmatrix | 2015-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -1/+1 |
| |\| | |||||
| | * | off by one | redmatrix | 2015-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |