aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bring some more generic-content-wrappers and fix some of themMario Vavti2015-06-1912-273/+282
|
* set return url from apps pageredmatrix2015-06-182-1/+3
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-189-7163/+7428
|\
| * Merge pull request #349 from git-marijus/masterredmatrix2015-06-172-3/+15
| |\ | | | | | | make photo upload work for remote channels with perms
| | * fix deleting of album for remote channelMario Vavti2015-06-161-2/+2
| | |
| | * make photo upload work for remote channels with permsMario Vavti2015-06-161-1/+13
| | |
| * | Small fix in siteinfojeroenpraat2015-06-161-1/+1
| |/
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-152-6998/+7222
| |\
| | * Update Dutch language stringsjeroenpraat2015-06-152-6998/+7222
| | |
| * | update spin.jsMario Vavti2015-06-152-157/+184
| |/
| * do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-153-4/+6
| |
* | issues with markdownify and escaped HTMLredmatrix2015-06-183-5/+13
|/
* version updateredmatrix2015-06-141-1/+1
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-131-1/+1
|\
| * Merge pull request #348 from unary/nginxconfigredmatrix2015-06-131-1/+1
| |\ | | | | | | nginx config change from Thomas
| | * nginx config change from ThomasMichael Johnston2015-06-131-1/+1
| |/
* / weekly string updateredmatrix2015-06-132-4401/+4582
|/
* don't provide a connect button on the sys channel profile sidebarredmatrix2015-06-111-0/+4
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-117-7225/+7179
|\
| * Merge pull request #347 from tuscanhobbit/devPaolo T2015-06-112-7219/+7160
| |\ | | | | | | updated italian strings
| | * updated italian stringsPaolo Tacconi2015-06-112-7219/+7160
| | |
| * | set width for region_3 only if center page content is setMario Vavti2015-06-113-4/+15
| | |
| * | fix rendering of affinity sliderMario Vavti2015-06-112-2/+4
| | |
* | | hubzilla compatibility functionredmatrix2015-06-112-1/+15
|/ /
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-101-21/+23
|\ \
| * \ Merge pull request #346 from solstag/fixattachpermsredmatrix2015-06-111-21/+23
| |\ \ | | | | | | | | correctly fix attachment permissions from private mentions
| | * | correctly fix attachment permissions from private mentionsAlexandre Hannud Abdo2015-06-101-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 ↵redmatrix2015-06-102-1/+7
|/ / | | | | | | mod_home
* | show login without checking for block_public, local or remote channelMario Vavti2015-06-101-6/+3
| |
* | assign right aside the same width as we have in left aside but hide it on ↵Mario Vavti2015-06-104-11/+18
| | | | | | | | small and xs screens. make aside width a variablee for easier handling.
* | really show login form if it is enabledMario Vavti2015-06-101-2/+2
| |
* | retire old Friendica RINO encryption functionsredmatrix2015-06-091-28/+0
| |
* | put mirror_frontpage setting into admin/siteredmatrix2015-06-092-0/+4
| |
* | toggle diaspora protocol on a per-channel level in addition to the existing ↵redmatrix2015-06-094-2/+34
| | | | | | | | per site setting. Default is enabled if the site setting is enabled.
* | s/broder/border/redmatrix2015-06-091-1/+1
| |
* | add nomadic identities as webfinger aliasesredmatrix2015-06-092-2/+11
| |
* | provide a mechanism for loading the frontpage without redirecting.redmatrix2015-06-081-0/+5
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-081-0/+12
|\ \
| * | css regression fixesMario Vavti2015-06-081-0/+12
| | |
* | | remove debuggingredmatrix2015-06-081-3/+0
| | |
* | | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵redmatrix2015-06-088-18/+52
|/ / | | | | | | webpages to be viewed even if site is configured "block public".
* | magic auth issues on dreamhostredmatrix2015-06-072-3/+6
| |
* | Merge branch 'frontpage'redmatrix2015-06-076-234/+223
|\ \
| * | make sure these are includedredmatrix2015-06-072-0/+189
| | |
| * | more frontpage tweaksredmatrix2015-06-073-4/+4
| | |
| * | reverse logic of homepage login settingredmatrix2015-06-073-5/+9
| | |
| * | frontpage tweaksredmatrix2015-06-073-5/+11
| | |
| * | frontpage changesredmatrix2015-06-072-230/+20
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-072-7229/+7132
|\ \ \
| * | | Upd NLjeroenpraat2015-06-072-7229/+7132
| |/ /