aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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 i...redmatrix2015-06-141-19/+25
* | make new os_storage flag workredmatrix2015-06-142-1/+5
* | more work on itemsredmatrix2015-06-113-8/+50
|\|
* | 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 mod_...redmatrix2015-06-101-0/+6
* | | 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
| |/
| * 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 p...redmatrix2015-06-091-2/+5
| * s/broder/border/redmatrix2015-06-091-1/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-098-239/+251
|\|
| * add nomadic identities as webfinger aliasesredmatrix2015-06-091-1/+10
| * provide a mechanism for loading the frontpage without redirecting.redmatrix2015-06-081-0/+5
| * remove debuggingredmatrix2015-06-081-3/+0
| * add site_dead flag to prevent delivery to dead sites. Allow sys channel webpa...redmatrix2015-06-082-6/+16
| * magic auth issues on dreamhostredmatrix2015-06-072-3/+6
| * make sure these are includedredmatrix2015-06-072-0/+189
| * more frontpage tweaksredmatrix2015-06-072-3/+3
| * reverse logic of homepage login settingredmatrix2015-06-072-4/+8
| * frontpage tweaksredmatrix2015-06-072-5/+10
| * frontpage changesredmatrix2015-06-071-229/+19
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-063-1/+6
|\|
| * Added translatable strings to the Display Settings page and refreshed util/me...jeroenpraat2015-06-061-0/+3
| * use the right webpage layout for an installed webpage if it existsMario Vavti2015-06-042-1/+3
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-023-36/+37
|\|
| * update help linkMario Vavti2015-06-021-1/+1
| * move the photo and attachment permission syncing past the tag replacement so ...redmatrix2015-06-011-34/+36
| * bare bones ASLDredmatrix2015-05-311-1/+0
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-315-15/+60
|\|
| * fix unable to crop profile pic on postgresHabeas Codice2015-05-301-1/+1
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-303-12/+18
| |\
| | * whitespaceMario Vavti2015-05-291-1/+1
| | * add some yes/no labels and minor template fixesMario Vavti2015-05-292-6/+6
| | * some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-291-5/+9
| | * show created/edited dates for menusMario Vavti2015-05-291-0/+2
| * | strip images from directory text entriesredmatrix2015-05-301-1/+1
| |/
| * untested menu element import, be aware that the menu api does not over-write ...redmatrix2015-05-281-7/+46