aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* this is weirdredmatrix2015-08-251-200/+186
|
* make diaspora person guids for hubzilla folks globally unique. That's what a ↵redmatrix2015-08-251-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_mergeredmatrix2015-08-241-137/+0
|\ | | | | | | | | | | Conflicts: mod/connections.php mod/connedit.php
| * remove orphan mod_connections editing code (now done in mod/connedit)redmatrix2015-08-242-140/+12
| |
* | edited event showing bad signature and null_date for edit timestampredmatrix2015-08-241-0/+5
| |
* | sync abook flags in memory after altering themredmatrix2015-08-231-0/+11
| |
* | change name of moduleredmatrix2015-08-223-6/+8
| |
* | restrict event notification to events and birthdays (exclude tasks)redmatrix2015-08-221-0/+2
| |
* | cleanup of task widget - make jquery workflow a bit smootherredmatrix2015-08-201-22/+32
| |
* | more work on tasksredmatrix2015-08-202-9/+25
| |
* | We don't need photos to also include attachments. It's interesting, but not ↵redmatrix2015-08-201-0/+1
| | | | | | | | all that useful.
* | some event related fixes and some base work for implementing native tasks ↵redmatrix2015-08-202-10/+99
| | | | | | | | (to-do lists); which should already be importable and exportable.
* | do ical export before checking logged in channelredmatrix2015-08-201-23/+21
| |
* | check perms on ical attachmentsredmatrix2015-08-191-3/+6
| |
* | event integration improvementsredmatrix2015-08-192-1/+31
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-181-1/+1
|\|
| * add month to export filename when using monthredmatrix2015-08-171-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-171-1/+1
|\|
| * off by oneredmatrix2015-08-171-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-171-1/+5
|\| | | | | | | | | Conflicts: include/identity.php
| * provide ability to export by month as well as by yearredmatrix2015-08-171-1/+5
| |
* | issues encountered whilst testing import_items module using yearly dump filesredmatrix2015-08-171-2/+1
| |
* | provide module for importing yearly content dumpsredmatrix2015-08-171-0/+173
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-161-7/+7
|\|
| * issue #386 - account and channel bulk edit checkboxes not visible and ↵redmatrix2015-08-161-7/+7
| | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-141-2/+3
|\| | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| * set email verified if lost password workflow is completed to avoid the ↵redmatrix2015-08-141-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_mergeredmatrix2015-08-121-0/+4
|\| | | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl
* | resolve conflictredmatrix2015-08-111-56/+6
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-111-0/+51
|\| | | | | | | | | | | Conflicts: doc/history.md mod/import.php
| * convert abook_flags from hubzilla during cloningredmatrix2015-08-101-4/+30
| |
* | bring back colour to abook_self in aclredmatrix2015-08-111-4/+4
| |
* | photo permission inheritance. We want to use the folder permissions unless ↵redmatrix2015-08-061-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 ↵redmatrix2015-08-051-20/+31
| | | | | | | | them with dav
* | don't throw errors or do the wrong thing if photos have no album (placed on ↵redmatrix2015-08-051-8/+13
| | | | | | | | your dav rootdir)
* | more work separating Diaspora from coreredmatrix2015-08-032-27/+1
| |
* | begin moving diaspora to pluginredmatrix2015-08-022-127/+0
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-311-1/+1
|\| | | | | | | | | Conflicts: util/messages.po
| * consistency of event formredmatrix2015-07-311-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-301-3/+3
|\| | | | | | | | | | | several dav fixes Conflicts: include/items.php
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-271-2/+16
|\| | | | | | | | | Conflicts: util/messages.po
| * crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-261-2/+16
| |
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-261-2/+2
|\ \
| * | fix abook_pending reset to 1 loop if $new_friend is false and remove unused varMario Vavti2015-07-251-2/+2
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-261-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 nowMario Vavti2015-07-261-15/+15
| |
| * Provide connection status if status is "a-normal"Mario Vavti2015-07-261-0/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-231-2/+1
|\| | | | | | | | | Conflicts: include/diaspora.php
| * event privacy issueredmatrix2015-07-231-2/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-211-0/+1
|\| | | | | | | | | Conflicts: doc/to_do_code.bb