Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 2 | -2/+10 |
|\ | | | | | | | | | Conflicts: include/attach.php | ||||
| * | 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 ↵ | redmatrix | 2015-10-12 | 1 | -3/+12 |
| | | | | | | | | import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process. | ||||
* | | 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 Help pages to include Hubzilla on OpenShift | ||||
| | * | | 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 how to post to a channel | ||||
| | * | | | Update the post docs adding https://github.com/redmatrix/hubzilla/issues/67 | ken restivo | 2015-10-08 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Merge pull request #77 from HaakonME/master | redmatrix | 2015-10-10 | 1 | -0/+81 |
| |\ \ \ \ | | | |_|/ | | |/| | | Updated Hubzilla on OpenShift README with HOWTO | ||||
| | * | | | Updated Hubzilla on OpenShift README with HOWTO | Haakon Meland Eriksen | 2015-10-09 | 1 | -0/+81 |
| | |/ / | |||||
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | version roll | redmatrix | 2015-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-09 | 3 | -335/+338 |
|\| | | |/ |/| | | | | | | | Conflicts: mod/uexport.php view/tpl/uexport.tpl | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-09 | 2 | -2/+27 |
| |\ | |||||
| | * | Redesigned the export page. Please fix my English if I made some mistakes. | jeroenpraat | 2015-10-09 | 2 | -11/+19 |
| | | | |||||
| | * | Merge pull request #397 from anaqreon/uexport | redmatrix | 2015-10-08 | 2 | -4/+1 |
| | |\ | | | | | | | | | There is no mod/import_items tool in RedMatrix | ||||
| | | * | There is no mod/import_items tool in RedMatrix | Andrew Manning | 2015-10-07 | 2 | -4/+1 |
| | |/ | |||||
| | * | Merge pull request #395 from anaqreon/uexport | redmatrix | 2015-10-08 | 2 | -2/+22 |
| | |\ | | | | | | | | | Add message about exporting by year/month to uexport | ||||
| | | * | Forgot the year and month url part | Andrew Manning | 2015-10-06 | 1 | -0/+6 |
| | | | | |||||
| | | * | Add message about exporting by year/month to uexport | Andrew Manning | 2015-10-06 | 2 | -2/+16 |
| | | | | |||||
| * | | | string update | redmatrix | 2015-10-09 | 2 | -3/+3 |
| |/ / | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-06 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-06 | 2 | -25/+25 |
| |\| | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | jeroenpraat | 2015-10-05 | 2 | -6/+6 |
| | |\ | |||||
| | * | | Final Spanish strings for Redmatrix | jeroenpraat | 2015-10-05 | 2 | -25/+25 |
| | | | | |||||
| * | | | version update | redmatrix | 2015-10-06 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-06 | 8 | -78/+131 |
|\ \ \ | |||||
| * | | | Updated Spanish strings | jeroenpraat | 2015-10-05 | 4 | -54/+54 |
| | | | | |||||
| * | | | bring our bbcode tools to private mail | Mario Vavti | 2015-10-05 | 4 | -24/+77 |
| | | | | |||||
* | | | | functions to update urls in items when doing migrations | redmatrix | 2015-10-06 | 1 | -0/+44 |
|/ / / | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-04 | 2 | -6/+6 |
|\| | | |||||
| * | | version and strings update | redmatrix | 2015-10-04 | 2 | -6/+6 |
| |/ | |||||
* | | do not show delete conversation in single message view | Mario Vavti | 2015-10-04 | 1 | -0/+2 |
| | |