aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-233-18/+29
|\ | | | | | | | | | | Conflicts: include/items.php mod/item.php
| * typoredmatrix2015-06-231-1/+1
| |
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-231-3/+3
| |\
| | * Merge pull request #356 from solstag/signature_edit_fixredmatrix2015-06-231-2/+2
| | |\ | | | | | | | | properly trims edited posts before signing so signature verification …
| | | * properly trims edited posts before signing so signature verification worksAlexandre Hannud Abdo2015-06-231-2/+2
| | | |
| | * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-221-0/+1
| | |\|
| | * | ensure we always sign a trimmed item body.redmatrix2015-06-221-1/+1
| | | |
| * | | some work on directoryMario Vavti2015-06-231-14/+23
| | |/ | |/|
| * | Bring /help in line with the rest of the appMario Vavti2015-06-221-0/+1
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-211-4/+20
|\| | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * import: Improve the descriptive text for this featureredmatrix2015-06-211-2/+2
| |
| * some diaspora import issues uncovered during dry-run testsredmatrix2015-06-211-6/+6
| |
| * automatically gunzip Diaspora export files if we're on a *nix systemredmatrix2015-06-191-0/+9
| |
| * very early attempt diaspora import from diaspora export file. Currently the ↵redmatrix2015-06-191-1/+8
| | | | | | | | json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-182-1/+3
|\|
| * set return url from apps pageredmatrix2015-06-182-1/+3
| |
* | more photos workredmatrix2015-06-172-4/+13
| |
* | lots of work on merging photo and file albums/foldersredmatrix2015-06-172-5/+9
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-162-1/+24
|\| | | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php
| * Merge pull request #349 from git-marijus/masterredmatrix2015-06-171-1/+13
| |\ | | | | | | make photo upload work for remote channels with perms
| | * make photo upload work for remote channels with permsMario Vavti2015-06-161-1/+13
| | |
| * | Small fix in siteinfojeroenpraat2015-06-161-1/+1
| |/
* | remove file/attachments when their associated photos are removedredmatrix2015-06-161-0/+7
| |
* | move profile photos to new methodsredmatrix2015-06-152-49/+39
| |
* | fix attachment permissions when they also contain an image.redmatrix2015-06-152-1/+16
| |
* | photo upload: pass in the contact_allow and resource_id via include/attach.phpredmatrix2015-06-151-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-151-3/+3
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-151-3/+3
| |
* | DB changes for some channel flagsredmatrix2015-06-157-33/+17
| |
* | sql errors after last major edit adventureredmatrix2015-06-142-2/+2
| |
* | convert the abook fieldsredmatrix2015-06-1416-132/+98
| |
* | first cut at merging files and photos, not yet well integrated but they are ↵redmatrix2015-06-141-19/+25
| | | | | | | | integrated
* | make new os_storage flag workredmatrix2015-06-142-1/+5
| |
* | more work on itemsredmatrix2015-06-113-8/+50
|\| | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
* | diaspora disallowed by defaultredmatrix2015-06-101-2/+0
| |
* | start to partition the davredmatrix2015-06-102-30/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-101-0/+6
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-101-21/+23
| |\
| * | put block_public back where it is needed, which is in mod_public and not ↵redmatrix2015-06-101-0/+6
| | | | | | | | | | | | mod_home
* | | more work on item table optimisationredmatrix2015-06-1013-45/+55
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-102-28/+27
|\ \ \ | | |/ | |/|
| * | correctly fix attachment permissions from private mentionsAlexandre Hannud Abdo2015-06-101-21/+23
| |/ | | | | | | by postponing code that removes the attachment tag from the body
| * show login without checking for block_public, local or remote channelMario Vavti2015-06-101-6/+3
| |
| * really show login form if it is enabledMario Vavti2015-06-101-2/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-092-2/+8
|\|
| * put mirror_frontpage setting into admin/siteredmatrix2015-06-091-0/+3
| |
| * toggle diaspora protocol on a per-channel level in addition to the existing ↵redmatrix2015-06-091-2/+5
| | | | | | | | per site setting. Default is enabled if the site setting is enabled.
| * s/broder/border/redmatrix2015-06-091-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-098-239/+251
|\| | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
| * add nomadic identities as webfinger aliasesredmatrix2015-06-091-1/+10
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 02:26:31 +0000