| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | version and strings | redmatrix | 2015-10-23 | 2 | -853/+869 |
|/ / |
|
* | | update the to-do list | redmatrix | 2015-10-22 | 1 | -6/+2 |
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-22 | 7 | -37/+59 |
|\ \ |
|
| * \ | Merge pull request #96 from mcnesium/master | git-marijus | 2015-10-22 | 1 | -2/+2 |
| |\ \ |
|
| | * | | Merge pull request #1 from mcnesium/placeholder-font | mcnesium | 2015-10-22 | 1 | -2/+2 |
| |/| | |
|
| | * | | fix placeholder font-family | mcnesium | 2015-10-22 | 1 | -2/+2 |
| |/ / |
|
| * | | photo object fixes | Mario Vavti | 2015-10-22 | 2 | -0/+10 |
| * | | experiment: put the photo-item photo on top of the post | Mario Vavti | 2015-10-22 | 2 | -6/+13 |
| * | | implement the new anchor target behaviour | Mario Vavti | 2015-10-22 | 1 | -1/+1 |
| * | | define $photo | Mario Vavti | 2015-10-22 | 1 | -0/+2 |
| * | | move photo object stuff from itemObject to prepare_body() so we can do more s... | Mario Vavti | 2015-10-22 | 5 | -31/+34 |
* | | | revision | redmatrix | 2015-10-22 | 1 | -1/+1 |
|/ / |
|
* | | set link target window for many links that are included in posts, but not in ... | redmatrix | 2015-10-21 | 1 | -16/+16 |
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-21 | 3 | -28/+29 |
|\ \ |
|
| * | | warn if quota exceeds 90% of storage limit | Mario Vavti | 2015-10-21 | 2 | -2/+2 |
| * | | move file storage quota display to upload section. add a warning if remaining... | Mario Vavti | 2015-10-21 | 3 | -28/+29 |
* | | | turn relative links in app_render() into absolute links, without affecting th... | redmatrix | 2015-10-21 | 2 | -4/+9 |
|/ / |
|
* | | old merge conflict | redmatrix | 2015-10-20 | 1 | -7/+1 |
* | | move quota display to where it's visible on a tablet | redmatrix | 2015-10-20 | 1 | -2/+3 |
* | | fix image path | jeroenpraat | 2015-10-20 | 1 | -2/+2 |
* | | some photos cant be deleted under certain circumstances - needs more investig... | Mario Vavti | 2015-10-20 | 1 | -4/+0 |
* | | add obj_type and object again | Mario Vavti | 2015-10-20 | 1 | -1/+3 |
* | | fix jot photo upload | Mario Vavti | 2015-10-20 | 1 | -10/+6 |
* | | update large photo feature setting description | Mario Vavti | 2015-10-20 | 1 | -1/+1 |
* | | css cleanup | Mario Vavti | 2015-10-20 | 1 | -4/+0 |
* | | create photo object if feature large photos is enabled and display those slig... | Mario Vavti | 2015-10-20 | 10 | -31/+98 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 2 | -4/+4 |
|\ \ |
|
| * | | add project info to pubsite list | redmatrix | 2015-10-19 | 2 | -4/+4 |
* | | | revert - we can't guarantee what project name the fallback directory server h... | redmatrix | 2015-10-19 | 1 | -6/+4 |
* | | | update site on initial directory setup | redmatrix | 2015-10-19 | 1 | -4/+7 |
* | | | extened the earlier fix | redmatrix | 2015-10-19 | 1 | -2/+2 |
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 0 | -0/+0 |
|\| | |
|
| * | | typo | redmatrix | 2015-10-19 | 1 | -1/+1 |
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 11 | -6825/+7139 |
|\| | |
|
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 4 | -6816/+7110 |
| |\ \ |
|
| | * | | Update es+nl | jeroenpraat | 2015-10-18 | 4 | -6816/+7110 |
| * | | | add the project name to site info packet | redmatrix | 2015-10-19 | 7 | -8/+27 |
| |/ / |
|
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-19 | 6 | -3/+3 |
|\ \ \ |
|
| * \ \ | Merge pull request #93 from tuscanhobbit/master | redmatrix | 2015-10-20 | 5 | -2/+2 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Replaced some old redmatrix branding | Paolo Tacconi | 2015-10-19 | 5 | -2/+2 |
| | * | | Merge pull request #1 from redmatrix/master | Wave | 2015-10-19 | 112 | -40350/+43079 |
| | |\ \ |
|
| * | | | | fix typo in mod/connedit.php | Mario Vavti | 2015-10-19 | 1 | -1/+1 |
| * | | | | fix typo in include/notifier.php | Mario Vavti | 2015-10-19 | 1 | -1/+1 |
| | |/ /
| |/| | |
|
* / | | | syntax error | redmatrix | 2015-10-19 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-18 | 2 | -4/+33 |
|\ \ \ |
|
| * \ \ | Merge pull request #92 from HaakonME/master | redmatrix | 2015-10-19 | 2 | -4/+33 |
| |\ \ \ |
|
| | * | | | Updated help page about Hubzilla on OpenShift with new info on using mysqlche... | Haakon Meland Eriksen | 2015-10-18 | 1 | -1/+1 |
| | * | | | Updated help page about Hubzilla on OpenShift with new info on using mysqlche... | Haakon Meland Eriksen | 2015-10-18 | 1 | -3/+25 |
| | * | | | Added config settings sensible for Hubzilla on OpenShift - fixes | Haakon Meland Eriksen | 2015-10-18 | 1 | -1/+1 |
| | * | | | Added config settings sensible for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-18 | 1 | -1/+8 |