aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-272-58/+84
|\| | | | | | | | | Conflicts: mod/impel.php
| * some high-level stuff we may need for shareable menus. Also make the client ↵redmatrix2015-05-271-57/+83
| | | | | | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
| * some work on issue #329redmatrix2015-05-251-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-251-5/+37
|\|
| * add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵redmatrix2015-05-251-5/+37
| | | | | | | | the censor flag from that page.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-244-11/+16
|\|
| * timezone setting not saved issue #336redmatrix2015-05-241-1/+1
| |
| * typo and update to rfc7033 (webfinger) as well as webfinger diagnostic pageredmatrix2015-05-243-10/+15
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-241-2/+2
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-242-191/+257
| |\
| * | search result heading not translatableredmatrix2015-05-241-2/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 21:45:17 +0000