Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 1 | -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. | ||||
* | set return url from apps page | redmatrix | 2015-06-18 | 2 | -1/+3 |
| | |||||
* | Merge pull request #349 from git-marijus/master | redmatrix | 2015-06-17 | 1 | -1/+13 |
|\ | | | | | make photo upload work for remote channels with perms | ||||
| * | make photo upload work for remote channels with perms | Mario Vavti | 2015-06-16 | 1 | -1/+13 |
| | | |||||
* | | Small fix in siteinfo | jeroenpraat | 2015-06-16 | 1 | -1/+1 |
|/ | |||||
* | do not allow/show acl button on photo edit if not owner | Mario Vavti | 2015-06-15 | 1 | -3/+3 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-10 | 1 | -21/+23 |
|\ | |||||
| * | correctly fix attachment permissions from private mentions | Alexandre Hannud Abdo | 2015-06-10 | 1 | -21/+23 |
| | | | | | | | | by postponing code that removes the attachment tag from the body | ||||
* | | put block_public back where it is needed, which is in mod_public and not ↵ | redmatrix | 2015-06-10 | 1 | -0/+6 |
|/ | | | | mod_home | ||||
* | show login without checking for block_public, local or remote channel | Mario Vavti | 2015-06-10 | 1 | -6/+3 |
| | |||||
* | really show login form if it is enabled | Mario Vavti | 2015-06-10 | 1 | -2/+2 |
| | |||||
* | put mirror_frontpage setting into admin/site | redmatrix | 2015-06-09 | 1 | -0/+3 |
| | |||||
* | toggle diaspora protocol on a per-channel level in addition to the existing ↵ | redmatrix | 2015-06-09 | 1 | -2/+5 |
| | | | | per site setting. Default is enabled if the site setting is enabled. | ||||
* | s/broder/border/ | redmatrix | 2015-06-09 | 1 | -1/+1 |
| | |||||
* | add nomadic identities as webfinger aliases | redmatrix | 2015-06-09 | 1 | -1/+10 |
| | |||||
* | provide a mechanism for loading the frontpage without redirecting. | redmatrix | 2015-06-08 | 1 | -0/+5 |
| | |||||
* | remove debugging | redmatrix | 2015-06-08 | 1 | -3/+0 |
| | |||||
* | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵ | redmatrix | 2015-06-08 | 2 | -6/+16 |
| | | | | webpages to be viewed even if site is configured "block public". | ||||
* | magic auth issues on dreamhost | redmatrix | 2015-06-07 | 2 | -3/+6 |
| | |||||
* | make sure these are included | redmatrix | 2015-06-07 | 2 | -0/+189 |
| | |||||
* | more frontpage tweaks | redmatrix | 2015-06-07 | 2 | -3/+3 |
| | |||||
* | reverse logic of homepage login setting | redmatrix | 2015-06-07 | 2 | -4/+8 |
| | |||||
* | frontpage tweaks | redmatrix | 2015-06-07 | 2 | -5/+10 |
| | |||||
* | frontpage changes | redmatrix | 2015-06-07 | 1 | -229/+19 |
| | |||||
* | Added translatable strings to the Display Settings page and refreshed ↵ | jeroenpraat | 2015-06-06 | 1 | -0/+3 |
| | | | | util/messages.po. | ||||
* | use the right webpage layout for an installed webpage if it exists | Mario Vavti | 2015-06-04 | 2 | -1/+3 |
| | |||||
* | update help link | Mario Vavti | 2015-06-02 | 1 | -1/+1 |
| | |||||
* | move the photo and attachment permission syncing past the tag replacement so ↵ | redmatrix | 2015-06-01 | 1 | -34/+36 |
| | | | | that attachments get the correct permissions when private mentions are used. | ||||
* | bare bones ASLD | redmatrix | 2015-05-31 | 1 | -1/+0 |
| | |||||
* | fix unable to crop profile pic on postgres | Habeas Codice | 2015-05-30 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-30 | 3 | -12/+18 |
|\ | |||||
| * | whitespace | Mario Vavti | 2015-05-29 | 1 | -1/+1 |
| | | |||||
| * | add some yes/no labels and minor template fixes | Mario Vavti | 2015-05-29 | 2 | -6/+6 |
| | | |||||
| * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 1 | -5/+9 |
| | | |||||
| * | show created/edited dates for menus | Mario Vavti | 2015-05-29 | 1 | -0/+2 |
| | | |||||
* | | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -1/+1 |
|/ | |||||
* | untested menu element import, be aware that the menu api does not over-write ↵ | redmatrix | 2015-05-28 | 1 | -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. | ||||
* | catch a window that wasn't yet saved when the last checkin occurred | redmatrix | 2015-05-27 | 1 | -1/+0 |
| | |||||
* | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 1 | -0/+4 |
| | |||||
* | missing row in sql query which is used further down | redmatrix | 2015-05-27 | 1 | -1/+1 |
| | |||||
* | some high-level stuff we may need for shareable menus. Also make the client ↵ | redmatrix | 2015-05-27 | 1 | -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 #329 | redmatrix | 2015-05-25 | 1 | -1/+1 |
| | |||||
* | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵ | redmatrix | 2015-05-25 | 1 | -5/+37 |
| | | | | the censor flag from that page. | ||||
* | timezone setting not saved issue #336 | redmatrix | 2015-05-24 | 1 | -1/+1 |
| | |||||
* | typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page | redmatrix | 2015-05-24 | 3 | -10/+15 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-24 | 2 | -191/+257 |
|\ | |||||
| * | Merge pull request #331 from solstag/jqueryprop | redmatrix | 2015-05-24 | 1 | -2/+2 |
| |\ | | | | | | | Fix accepting contacts by using correct jquery calls. | ||||
| | * | Fix accepting contacts by using correct jquery calls. | Alexandre Hannud Abdo | 2015-05-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure what the operation on disabled is supposed to do, but it also seemed to requier prop instead of attr. See for reference: http://api.jquery.com/prop/ """ The checked attribute value does not change with the state of the checkbox, while the checked property does. """ | ||||
| * | | Add PHP's xml module check and upload limits to setup. | Klaus Weidenbach | 2015-05-24 | 1 | -189/+255 |
| |/ | | | | | | | And some documentation. | ||||
* / | search result heading not translatable | redmatrix | 2015-05-24 | 1 | -2/+2 |
|/ |