aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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 mentionsAlexandre Hannud Abdo2015-06-101-21/+23
| |/ /
* / / put block_public back where it is needed, which is in mod_public and not mod_...redmatrix2015-06-102-1/+7
|/ /
* | 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 sma...Mario Vavti2015-06-104-11/+18
* | 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 p...redmatrix2015-06-094-2/+34
* | 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 webpa...redmatrix2015-06-088-18/+52
|/ /
* | 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
| |/ /
* / / version updateredmatrix2015-06-071-1/+1
|/ /
* | missing commaMario Vavti2015-06-061-1/+1
* | Added translatable strings to the Display Settings page and refreshed util/me...jeroenpraat2015-06-063-4618/+4478
* | css fixesMario Vavti2015-06-061-17/+9
* | whitespaceMario Vavti2015-06-061-169/+175
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-062-175/+176
|\ \
| * \ Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-0612-415/+498
| |\ \
| * | | string/version updateredmatrix2015-06-062-175/+176
* | | | some cleanup after scheme transitionMario Vavti2015-06-062-196/+19
| |/ / |/| |
* | | More schemas in new formatjeroenpraat2015-06-054-119/+114
* | | use the right webpage layout for an installed webpage if it existsMario Vavti2015-06-042-1/+3
* | | some doco on webpage blocksMario Vavti2015-06-041-2/+78
* | | Schemas: should be ok now.jeroenpraat2015-06-037-342/+116
* | | 2 more schemas in new formatjeroenpraat2015-06-034-239/+473
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixjeroenpraat2015-06-032-4/+14
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-025-328/+286
| |\ \
| * | | asjld workredmatrix2015-06-022-4/+14
* | | | empty php schema backjeroenpraat2015-06-031-0/+2
| |/ / |/| |