aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-144-4195/+4173
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-141-4193/+4122
| |\
| | * Regenerated messages.po.jeroenpraat2015-10-141-4193/+4122
| | |
| * | support for mail syncredmatrix2015-10-143-2/+51
| |/
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-131-0/+1
|\ \
| * | do not collapse content which is just slightly higher than we allowMario Vavti2015-10-131-0/+1
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-132-4/+5
|\ \ \ | | |/ | |/| | | | | | | Conflicts: include/api.php
| * | api extenesions for file migrationredmatrix2015-10-132-5/+6
| | |
* | | file migration - continuedredmatrix2015-10-131-4/+29
| |/ |/|
* | port of file detail api callredmatrix2015-10-121-3/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-121-0/+24
|\|
| * file detail api call (will not work for huge files)redmatrix2015-10-121-0/+24
| |
* | missing underscoreredmatrix2015-10-121-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-122-2/+10
|\| | | | | | | | | Conflicts: include/attach.php
| * attach_list_files had some problems - wasn't used until now apparentlyredmatrix2015-10-122-2/+10
| |
* | small change to allow a person with sufficient privileges the ability to ↵redmatrix2015-10-121-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_mergeredmatrix2015-10-1214-923/+1021
|\ \
| * | update es + nl stringsjeroenpraat2015-10-134-846/+854
| | |
| * | Merge pull request #79 from HaakonME/masterredmatrix2015-10-123-2/+92
| |\ \ | | | | | | | | Updated Help pages to include Hubzilla on OpenShift
| | * | Updated Hubzilla on OpenShift HOWTO with use of loggingHaakon Meland Eriksen2015-10-112-0/+16
| | | |
| | * | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-0/+1
| | | |
| | * | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-1/+1
| | | |
| | * | Updated README for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-2/+2
| | | |
| | * | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-1/+1
| | | |
| | * | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-7/+9
| | | |
| | * | Added link to Hubzilla on OpenShift HOWTO using ProjectnameHaakon Meland Eriksen2015-10-101-1/+1
| | | |
| | * | Added link to Hubzilla on OpenShift HOWTOHaakon Meland Eriksen2015-10-101-0/+1
| | | |
| | * | Hubzilla on OpenShift HOWTO added to HelpHaakon Meland Eriksen2015-10-101-0/+70
| | | |
| * | | another collapseHeight() fixMario Vavti2015-10-111-1/+1
| | | |
| * | | fix an issue with collapseHeight() and css margins/paddings in directoryMario Vavti2015-10-111-0/+3
| | | |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-111-1/+1
| |\ \ \
| * | | | some conv-item restructuring to allow full width elementsMario Vavti2015-10-115-74/+71
| | | | |
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | version rollredmatrix2015-10-121-1/+1
| | | |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-114-4/+85
|\ \ \ \ | | |/ / | |/| |
| * | | Added Hubzilla banner to the Readme (for Github)jeroenpraat2015-10-112-2/+1
| | | |
| * | | Merge pull request #76 from kenrestivo/update-post-docsredmatrix2015-10-101-2/+3
| |\ \ \ | | | | | | | | | | Update the post docs adding how to post to a channel
| | * | | Update the post docs adding https://github.com/redmatrix/hubzilla/issues/67ken restivo2015-10-081-2/+3
| | | | |
| * | | | Merge pull request #77 from HaakonME/masterredmatrix2015-10-101-0/+81
| |\ \ \ \ | | | |_|/ | | |/| | Updated Hubzilla on OpenShift README with HOWTO
| | * | | Updated Hubzilla on OpenShift README with HOWTOHaakon Meland Eriksen2015-10-091-0/+81
| | |/ /
* | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-111-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | version rollredmatrix2015-10-111-1/+1
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-093-335/+338
|\| | | |/ |/| | | | | | | Conflicts: mod/uexport.php view/tpl/uexport.tpl
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-092-2/+27
| |\
| | * Redesigned the export page. Please fix my English if I made some mistakes.jeroenpraat2015-10-092-11/+19
| | |
| | * Merge pull request #397 from anaqreon/uexportredmatrix2015-10-082-4/+1
| | |\ | | | | | | | | There is no mod/import_items tool in RedMatrix
| | | * There is no mod/import_items tool in RedMatrixAndrew Manning2015-10-072-4/+1
| | |/
| | * Merge pull request #395 from anaqreon/uexportredmatrix2015-10-082-2/+22
| | |\ | | | | | | | | Add message about exporting by year/month to uexport
| | | * Forgot the year and month url partAndrew Manning2015-10-061-0/+6
| | | |
| | | * Add message about exporting by year/month to uexportAndrew Manning2015-10-062-2/+16
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 11:03:26 +0000