aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Small fix to deployHaakon Meland Eriksen2015-10-011-1/+1
|
* Changed deploy script - removed hot_deploy and changed poller to every 10 ↵Haakon Meland Eriksen2015-10-011-7/+7
| | | | minutes rather than 5 minutes.
* Updated Norwegian strings for HubzillaHaakon Meland Eriksen2015-10-011-1502/+1560
|
* Updated Norwegian string for HubzillaHaakon Meland Eriksen2015-10-011-6214/+6500
|
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-10-0113-21033/+22308
|\
| * Merge pull request #65 from tuscanhobbit/masterWave2015-10-012-17/+17
| |\ | | | | | | More updates on Italian translation from transifex
| | * 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 localization
| | * 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 ↵redmatrix2015-09-301-1/+5
| | | | | | | | | | | | options on deleted hublocs
| * | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/zot.php view/de/messages.po view/de/strings.php
| | * | 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 strings
| | | | * | 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 strings
| | * | update German stringszottel2015-09-302-7447/+7960
| | | |
| | * | Merge remote-tracking branch 'upstream/master'zottel2015-09-307-7484/+7880
| | |\ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'upstream/master'zottel2015-09-2967-3014/+137292
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-2515-0/+0
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-2523-160/+425
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-249-9/+33
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-2326-194/+464
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-1925-25/+144
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-1820-361/+392
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-1711-66/+61
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-1633-247/+314
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-1422-110/+203
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-1120-580/+593
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-1014-25/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-0917-61/+361
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-0810-107/+276
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-073-9/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-0714-45/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-0411-25/+174
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2015-09-0316-225/+546
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/zot.php
| | * | | | | | | | | | | | | | | | | | | | really fix post filteringzottel2015-09-021-3/+4
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-3084-3019/+137693
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | 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 ↵redmatrix2015-09-291-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and/or site moves
| * | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-293-7475/+7765
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \