| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | sql errors after last major edit adventure | redmatrix | 2015-06-14 | 2 | -2/+2 |
| * | convert the abook fields | redmatrix | 2015-06-14 | 34 | -279/+241 |
| * | more file/photo merge work | redmatrix | 2015-06-14 | 2 | -17/+51 |
| * | first cut at merging files and photos, not yet well integrated but they are i... | redmatrix | 2015-06-14 | 3 | -24/+35 |
| * | make new os_storage flag work | redmatrix | 2015-06-14 | 2 | -1/+5 |
| * | isolate the os_storage flag | redmatrix | 2015-06-13 | 3 | -23/+29 |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-13 | 3 | -4/+12 |
| |\ |
|
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-13 | 1 | -1/+1 |
| | |\ |
|
| | | * | Merge pull request #348 from unary/nginxconfig | redmatrix | 2015-06-13 | 1 | -1/+1 |
| | | |\ |
|
| | | | * | nginx config change from Thomas | Michael Johnston | 2015-06-13 | 1 | -1/+1 |
| | | |/ |
|
| | * / | weekly string update | redmatrix | 2015-06-13 | 2 | -4401/+4582 |
| | |/ |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-11 | 1 | -0/+4 |
| |\| |
|
| | * | don't provide a connect button on the sys channel profile sidebar | redmatrix | 2015-06-11 | 1 | -0/+4 |
| * | | make cloud work again | redmatrix | 2015-06-11 | 5 | -6/+6 |
| * | | start on the DAV/photos merger | redmatrix | 2015-06-11 | 2 | -12/+32 |
| * | | more work on items | redmatrix | 2015-06-11 | 13 | -38/+164 |
| |\| |
|
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-11 | 7 | -7225/+7179 |
| | |\ |
|
| | | * | Merge pull request #347 from tuscanhobbit/dev | Paolo T | 2015-06-11 | 2 | -7219/+7160 |
| | | |\ |
|
| | | | * | updated italian strings | Paolo Tacconi | 2015-06-11 | 2 | -7219/+7160 |
| | | * | | set width for region_3 only if center page content is set | Mario Vavti | 2015-06-11 | 3 | -4/+15 |
| | | * | | fix rendering of affinity slider | Mario Vavti | 2015-06-11 | 2 | -2/+4 |
| | * | | | hubzilla compatibility function | redmatrix | 2015-06-11 | 2 | -1/+15 |
| | |/ / |
|
| * | | | the hubzilla version of this function | redmatrix | 2015-06-11 | 1 | -0/+12 |
| * | | | diaspora disallowed by default | redmatrix | 2015-06-10 | 3 | -8/+0 |
| * | | | start to partition the dav | redmatrix | 2015-06-10 | 2 | -30/+5 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 2 | -1/+7 |
| |\| | |
|
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-10 | 1 | -21/+23 |
| | |\ \ |
|
| | * | | | put block_public back where it is needed, which is in mod_public and not mod_... | redmatrix | 2015-06-10 | 2 | -1/+7 |
| * | | | | more work on item table optimisation | redmatrix | 2015-06-10 | 19 | -82/+123 |
| * | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 7 | -67/+45 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | Merge pull request #346 from solstag/fixattachperms | redmatrix | 2015-06-11 | 1 | -21/+23 |
| | |\ \ \
| | |/ /
| |/| | |
|
| | | * | | correctly fix attachment permissions from private mentions | Alexandre Hannud Abdo | 2015-06-10 | 1 | -21/+23 |
| | |/ / |
|
| | * | | show login without checking for block_public, local or remote channel | Mario Vavti | 2015-06-10 | 1 | -6/+3 |
| | * | | assign right aside the same width as we have in left aside but hide it on sma... | Mario Vavti | 2015-06-10 | 4 | -11/+18 |
| | * | | really show login form if it is enabled | Mario Vavti | 2015-06-10 | 1 | -2/+2 |
| | * | | retire old Friendica RINO encryption functions | redmatrix | 2015-06-09 | 1 | -28/+0 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 6 | -2/+38 |
| |\| | |
|
| | * | | put mirror_frontpage setting into admin/site | redmatrix | 2015-06-09 | 2 | -0/+4 |
| | * | | toggle diaspora protocol on a per-channel level in addition to the existing p... | redmatrix | 2015-06-09 | 4 | -2/+34 |
| | * | | s/broder/border/ | redmatrix | 2015-06-09 | 1 | -1/+1 |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 17 | -254/+303 |
| |\| | |
|
| | * | | add nomadic identities as webfinger aliases | redmatrix | 2015-06-09 | 2 | -2/+11 |
| | * | | provide a mechanism for loading the frontpage without redirecting. | redmatrix | 2015-06-08 | 1 | -0/+5 |
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-08 | 1 | -0/+12 |
| | |\ \ |
|
| | | * | | css regression fixes | Mario Vavti | 2015-06-08 | 1 | -0/+12 |
| | * | | | remove debugging | redmatrix | 2015-06-08 | 1 | -3/+0 |
| | * | | | add site_dead flag to prevent delivery to dead sites. Allow sys channel webpa... | redmatrix | 2015-06-08 | 8 | -18/+52 |
| | |/ / |
|
| | * | | magic auth issues on dreamhost | redmatrix | 2015-06-07 | 2 | -3/+6 |
| | * | | Merge branch 'frontpage' | redmatrix | 2015-06-07 | 6 | -234/+223 |
| | |\ \ |
|
| | | * | | make sure these are included | redmatrix | 2015-06-07 | 2 | -0/+189 |
