Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-14 | 5 | -4196/+4174 | |
|\| | | | ||||||
| * | | | issue #82 - args not defined (should be arr) | redmatrix | 2015-10-14 | 1 | -1/+1 | |
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-14 | 4 | -630/+656 | |
| |\ \ \ | ||||||
| * | | | | port of mail encoding | redmatrix | 2015-10-14 | 1 | -8/+8 | |
| * | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-14 | 4 | -4195/+4173 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-14 | 1 | -4193/+4122 | |
| | |\ \ \ | ||||||
| | | * | | | Regenerated messages.po. | jeroenpraat | 2015-10-14 | 1 | -4193/+4122 | |
| | * | | | | support for mail sync | redmatrix | 2015-10-14 | 3 | -2/+51 | |
| | |/ / / | ||||||
* | | | | | remove $item from $prep_arr - we probably do not need it | Mario Vavti | 2015-10-14 | 1 | -1/+1 | |
* | | | | | really check for large photos feature | Mario Vavti | 2015-10-14 | 2 | -2/+2 | |
* | | | | | allow photo-items to appear full width if large photos feature is enabled. in... | Mario Vavti | 2015-10-14 | 12 | -153/+179 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #80 from git-marijus/master | redmatrix | 2015-10-14 | 2 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | fix photo visibility switch on photo upload | Mario Vavti | 2015-10-13 | 1 | -2/+2 | |
| * | | | | fix /channel not updating after posting comment | Mario Vavti | 2015-10-13 | 1 | -1/+1 | |
* | | | | | Merge pull request #81 from tuscanhobbit/master | Wave | 2015-10-14 | 2 | -627/+653 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Italian strings updated | Paolo Tacconi | 2015-10-14 | 2 | -627/+653 | |
* | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-13 | 1 | -0/+1 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | do not collapse content which is just slightly higher than we allow | Mario Vavti | 2015-10-13 | 1 | -0/+1 | |
* | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-13 | 2 | -4/+5 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | api extenesions for file migration | redmatrix | 2015-10-13 | 2 | -5/+6 | |
* | | | | | file migration - continued | redmatrix | 2015-10-13 | 1 | -4/+29 | |
| |/ / / |/| | | | ||||||
* | | | | port of file detail api call | redmatrix | 2015-10-12 | 1 | -3/+1 | |
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 1 | -0/+24 | |
|\| | | | ||||||
| * | | | file detail api call (will not work for huge files) | redmatrix | 2015-10-12 | 1 | -0/+24 | |
* | | | | missing underscore | redmatrix | 2015-10-12 | 1 | -1/+1 | |
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 2 | -2/+10 | |
|\| | | | ||||||
| * | | | attach_list_files had some problems - wasn't used until now apparently | redmatrix | 2015-10-12 | 2 | -2/+10 | |
* | | | | small change to allow a person with sufficient privileges the ability to impo... | redmatrix | 2015-10-12 | 1 | -3/+12 | |
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-12 | 14 | -923/+1021 | |
|\ \ \ \ | ||||||
| * | | | | update es + nl strings | jeroenpraat | 2015-10-13 | 4 | -846/+854 | |
| * | | | | Merge pull request #79 from HaakonME/master | redmatrix | 2015-10-12 | 3 | -2/+92 | |
| |\ \ \ \ | ||||||
| | * | | | | Updated Hubzilla on OpenShift HOWTO with use of logging | Haakon Meland Eriksen | 2015-10-11 | 2 | -0/+16 | |
| | * | | | | Updated help page for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-10 | 1 | -0/+1 | |
| | * | | | | Updated help page for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-10 | 1 | -1/+1 | |
| | * | | | | Updated README for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-10 | 1 | -2/+2 | |
| | * | | | | Updated help page for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-10 | 1 | -1/+1 | |
| | * | | | | Updated help page for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-10 | 1 | -7/+9 | |
| | * | | | | Added link to Hubzilla on OpenShift HOWTO using Projectname | Haakon Meland Eriksen | 2015-10-10 | 1 | -1/+1 | |
| | * | | | | Added link to Hubzilla on OpenShift HOWTO | Haakon Meland Eriksen | 2015-10-10 | 1 | -0/+1 | |
| | * | | | | Hubzilla on OpenShift HOWTO added to Help | Haakon Meland Eriksen | 2015-10-10 | 1 | -0/+70 | |
| * | | | | | another collapseHeight() fix | Mario Vavti | 2015-10-11 | 1 | -1/+1 | |
| * | | | | | fix an issue with collapseHeight() and css margins/paddings in directory | Mario Vavti | 2015-10-11 | 1 | -0/+3 | |
| * | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-11 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | some conv-item restructuring to allow full width elements | Mario Vavti | 2015-10-11 | 5 | -74/+71 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | ||||||
| * | | | | version roll | redmatrix | 2015-10-12 | 1 | -1/+1 | |
* | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-11 | 4 | -4/+85 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Added Hubzilla banner to the Readme (for Github) | jeroenpraat | 2015-10-11 | 2 | -2/+1 | |
| * | | | | Merge pull request #76 from kenrestivo/update-post-docs | redmatrix | 2015-10-10 | 1 | -2/+3 | |
| |\ \ \ \ | ||||||
| | * | | | | Update the post docs adding https://github.com/redmatrix/hubzilla/issues/67 | ken restivo | 2015-10-08 | 1 | -2/+3 |