aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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 ↵redmatrix2015-06-082-6/+16
| | | | | | | | webpages to be viewed even if site is configured "block public".
| * 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
|\| | | | | | | | | Conflicts: util/messages.po
| * Added translatable strings to the Display Settings page and refreshed ↵jeroenpraat2015-06-061-0/+3
| | | | | | | | util/messages.po.
| * 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
| | | | | | | | that attachments get the correct permissions when private mentions are used.
| * 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
| | | | | | | | on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-282-0/+4
|\| | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
| * catch a window that wasn't yet saved when the last checkin occurredredmatrix2015-05-271-1/+0
| |
| * menu encoding for sharing/exchangeredmatrix2015-05-271-0/+4
| |
| * missing row in sql query which is used further downredmatrix2015-05-271-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 22:48:54 +0000