aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Updating OpenShift deploy scriptHaakon Meland Eriksen2015-09-041-0/+24
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-0334-708/+1358
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-0116-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix filenameHaakon Meland Eriksen2015-09-011-2/+1
| * | | | | | | | | | | | | | | | Fixed deploy scriptHaakon Meland Eriksen2015-09-011-8/+37
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-011-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Added openshift-hubzilla-deploy to .openshift/action_hooks/deployHaakon Meland Eriksen2015-09-011-0/+110
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-0147-663/+722
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-2723-1165/+1188
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-2333-238/+532
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-1945-11403/+20389
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-0613-117/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Hubzilla addons addedHaakon Meland Eriksen2015-08-031-0/+5
| * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-0319-3273/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-07-2997-1293/+1407
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-07-082-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-07-0711-9/+206
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Added cron script to exexute poller every 5 minutesHaakon Meland Eriksen2015-07-051-0/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'openshift/master'Haakon Meland Eriksen2015-07-0514-0/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Creating templateTemplate builder2015-07-0515-0/+352
| | / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-013-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | update cert authoritiesredmatrix2015-10-013-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #65 from tuscanhobbit/masterWave2015-10-012-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | More updates on Italian translation from transifexPaolo Tacconi2015-10-012-17/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #64 from tuscanhobbit/masterWave2015-10-012-7589/+7886
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | First Hubzilla Italian localizationPaolo Tacconi2015-10-012-7589/+7886
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | this is an even better fix for issue #61redmatrix2015-09-301-8/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | issue #61 - provide un-useable icons as placeholders for location setting opt...redmatrix2015-09-301-1/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | issue #63 - missing table fields in db queryredmatrix2015-09-301-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | update the opensearch templateredmatrix2015-09-301-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | add delivery reports to mail (not backported to redmatrix)redmatrix2015-09-304-7/+65
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-304-5978/+6384
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | document the issue with cloned delivery to self vs normal delivery to selfredmatrix2015-09-301-2/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-302-1863/+1872
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #394 from zzottel/masterzzottel2015-09-302-1863/+1872
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | update German stringszottel2015-09-302-1863/+1872
| | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / undo self-deliver checkredmatrix2015-09-302-6/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | undo self deliver checkredmatrix2015-09-301-5/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #62 from zzottel/masterzzottel2015-09-302-7447/+7960
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | update German stringszottel2015-09-302-7447/+7960
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'zottel2015-09-307-7484/+7880
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | another error from the db logsredmatrix2015-09-291-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | wrong table column namesredmatrix2015-09-292-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | queue cleanup, and report issuesredmatrix2015-09-292-5/+32
* | | | | | | | | | | | | | | | | | | | | | | | | | more work on the notifierredmatrix2015-09-292-2/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | improve the sys channel location repair to check key issues and re-installs a...redmatrix2015-09-291-2/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-293-7475/+7765
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Hooray! Dutch language complete again.jeroenpraat2015-09-292-7475/+7759
* | | | | | | | | | | | | | | | | | | | | | | | | | | check and repair sys channel locations (hublocs) in zot-finger if they are me...redmatrix2015-09-291-0/+61
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'zottel2015-09-2967-3014/+137292
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |