| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-22 | 5 | -29/+29 |
| |\ | |||||
| | * | Bring /help in line with the rest of the app | Mario Vavti | 2015-06-22 | 5 | -29/+29 |
| | | | |||||
| * | | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 2 | -4/+4 |
| | | | |||||
| * | | discovered a couple of loose ends in the per-member enable diaspora setting | redmatrix | 2015-06-22 | 2 | -1/+27 |
| |/ | |||||
| * | import: Improve the descriptive text for this feature | redmatrix | 2015-06-21 | 1 | -2/+2 |
| | | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-21 | 3 | -7/+6 |
| |\ | |||||
| | * | Merge pull request #355 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -9/+23 |
| | |\ | | | | | | | Compatible update for .htaccess v2. | ||||
| | | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-22 | 3 | -9/+23 |
| | | | | | | | | | | | | | This should hopefully work in Apache 2.2 and 2.4. | ||||
| | * | | Merge pull request #354 from redmatrix/revert-353-master | Klaus | 2015-06-22 | 3 | -23/+8 |
| | |\ \ | | | | | | | | | Revert "Compatible update for .htaccess." | ||||
| | | * | | Revert "Compatible update for .htaccess." | Klaus | 2015-06-22 | 3 | -23/+8 |
| | |/ / | |||||
| * / / | 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. | ||||
| | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-21 | 3 | -8/+23 |
| |/ | | | | This should hopefully work in Apache 2.2 and 2.4. | ||||
| * | do not show default in scheme selection dropdown. default.php and ↵ | Mario Vavti | 2015-06-21 | 5 | -3/+8 |
| | | | | | default.css should be symlinks. adjust doco accordingly. | ||||
| * | 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 | ||||
| | * | 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 ↵ | redmatrix | 2015-06-20 | 2 | -21/+43 |
| | | | | | | | | | duplicate reddress detection/correction | ||||
| * | | 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 ↵ | redmatrix | 2015-06-19 | 4 | -110/+221 |
| |/ | | | | 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 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 |
| | |\ | | | | | | | make photo upload work for remote channels with perms | ||||
| | | * | 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 | ||||
| | | * | 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 | ||||
| | | * | 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 |
| |/ / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |