aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | small change to allow a person with sufficient privileges the ability to impo...redmatrix2015-10-121-3/+12
* | | | 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 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 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 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
|\| | | | |/ / |/| |
| * | 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 RedMatrixAndrew Manning2015-10-072-4/+1
| | |/ /
| | * | Merge pull request #395 from anaqreon/uexportredmatrix2015-10-082-2/+22
| | |\ \
| | | * | 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
| * | | | string updateredmatrix2015-10-092-3/+3
| |/ / /
* | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-061-1/+1
|\| | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-062-25/+25
| |\| |
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrixjeroenpraat2015-10-052-6/+6
| | |\ \
| | * | | Final Spanish strings for Redmatrixjeroenpraat2015-10-052-25/+25
| * | | | version updateredmatrix2015-10-061-1/+1
| | |/ / | |/| |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-068-78/+131
|\ \ \ \
| * | | | Updated Spanish stringsjeroenpraat2015-10-054-54/+54
| * | | | bring our bbcode tools to private mailMario Vavti2015-10-054-24/+77
* | | | | functions to update urls in items when doing migrationsredmatrix2015-10-061-0/+44
|/ / / /
* | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-042-6/+6
|\| | |
| * | | version and strings updateredmatrix2015-10-042-6/+6
| |/ /
* | | do not show delete conversation in single message viewMario Vavti2015-10-041-0/+2
* | | bring single message view to inbox/outbox viewMario Vavti2015-10-043-3/+9
* | | add anchors to messages and linksMario Vavti2015-10-042-1/+2