aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * provide content-disposition for exported ics fileredmatrix2015-07-201-0/+1
| |
| * provide a way to export a single year of items (to potentially keep from ↵redmatrix2015-07-161-1/+9
| | | | | | | | exhausting resources either on export or import)
* | the view_photos and post_photos permissions are redundant and are now mapped ↵redmatrix2015-07-194-9/+6
| | | | | | | | to view_storage and write_storage
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-181-2/+2
|\ \
| * | make likes/dislikes work againMario Vavti2015-07-171-2/+2
| | |
* | | provide any single year of exported itemsredmatrix2015-07-161-2/+12
|/ /
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-151-1/+1
|\| | | | | | | | | Conflicts: include/zot.php
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-151-4/+5
|\|
| * provide info text for automatic permissionsMario Vavti2015-07-151-1/+1
| |
| * whitespaceMario Vavti2015-07-151-4/+0
| |
| * show inherited state in Connection Default PermissionsMario Vavti2015-07-151-2/+7
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-0/+1
|\| | | | | | | | | Conflicts: mod/import.php
| * fix import of group membersredmatrix2015-07-141-1/+1
| |
* | group fixes to importredmatrix2015-07-141-4/+14
| |
* | more stuff to resume failed importsredmatrix2015-07-141-1/+13
| |
* | log the import progressredmatrix2015-07-141-3/+9
| |
* | provide resumable imports if things go wrongredmatrix2015-07-141-285/+329
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-143-81/+46
|\| | | | | | | | | Conflicts: mod/connedit.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-141-80/+44
| |\
| | * make strings translateableMario Vavti2015-07-141-0/+6
| | |
| | * revert provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+1
| | |
| | * remove dbgMario Vavti2015-07-141-2/+0
| | |
| | * provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 17:56:15 +0000