| Commit message (Expand) | Author | Age | Files | Lines |
* | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 4 | -13/+14 |
* | Merge pull request #353 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -8/+23 |
|\ |
|
| * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-21 | 3 | -8/+23 |
|/ |
|
* | do not show default in scheme selection dropdown. default.php and default.css... | Mario Vavti | 2015-06-21 | 5 | -3/+8 |
* | Merge pull request #352 from solstag/store_update_fix | redmatrix | 2015-06-21 | 1 | -9/+10 |
|\ |
|
| * | Make item_store_update only affect the data we requested | Alexandre Hannud Abdo | 2015-06-20 | 1 | -9/+10 |
* | | ensure the photo driver is included | redmatrix | 2015-06-20 | 1 | -0/+1 |
* | | import_diaspora - incorrect method for importing channel photo, and add dupli... | redmatrix | 2015-06-20 | 2 | -21/+43 |
* | | wrong logic | redmatrix | 2015-06-19 | 1 | -1/+1 |
* | | import_diaspora - a few more atypical settings | redmatrix | 2015-06-19 | 1 | -3/+19 |
* | | automatically gunzip Diaspora export files if we're on a *nix system | redmatrix | 2015-06-19 | 1 | -0/+9 |
* | | import_diaspora: add all the friends | redmatrix | 2015-06-19 | 1 | -4/+13 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-19 | 16 | -308/+330 |
|\ \ |
|
| * | | more generic-content-wrapper and some css fixes | Mario Vavti | 2015-06-19 | 3 | -35/+44 |
| * | | cloud.tpl | Mario Vavti | 2015-06-19 | 1 | -0/+4 |
| * | | bring some more generic-content-wrappers and fix some of them | Mario Vavti | 2015-06-19 | 12 | -273/+282 |
| |/ |
|
* / | very early attempt diaspora import from diaspora export file. Currently the j... | redmatrix | 2015-06-19 | 4 | -110/+221 |
|/ |
|
* | set return url from apps page | redmatrix | 2015-06-18 | 2 | -1/+3 |
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-18 | 9 | -7163/+7428 |
|\ |
|
| * | Merge pull request #349 from git-marijus/master | redmatrix | 2015-06-17 | 2 | -3/+15 |
| |\ |
|
| | * | fix deleting of album for remote channel | Mario Vavti | 2015-06-16 | 1 | -2/+2 |
| | * | 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 |
| |/ |
|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-15 | 2 | -6998/+7222 |
| |\ |
|
| | * | Update Dutch language strings | jeroenpraat | 2015-06-15 | 2 | -6998/+7222 |
| * | | update spin.js | Mario Vavti | 2015-06-15 | 2 | -157/+184 |
| |/ |
|
| * | do not allow/show acl button on photo edit if not owner | Mario Vavti | 2015-06-15 | 3 | -4/+6 |
* | | issues with markdownify and escaped HTML | redmatrix | 2015-06-18 | 3 | -5/+13 |
|/ |
|
* | version update | redmatrix | 2015-06-14 | 1 | -1/+1 |
* | 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 |
|/ |
|
* | don't provide a connect button on the sys channel profile sidebar | redmatrix | 2015-06-11 | 1 | -0/+4 |
* | 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 |
|/ / |
|
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-10 | 1 | -21/+23 |
|\ \ |
|
| * \ | 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 |
| |/ / |
|
* / / | put block_public back where it is needed, which is in mod_public and not mod_... | redmatrix | 2015-06-10 | 2 | -1/+7 |
|/ / |
|
* | | 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 |
* | | 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 |