aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ | |/ / |/| |
* | | 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
|\ \ \
| * | | Hooray! Dutch language complete again.jeroenpraat2015-09-292-7475/+7759
| | | |
* | | | check and repair sys channel locations (hublocs) in zot-finger if they are ↵redmatrix2015-09-291-0/+61
| | | | | | | | | | | | | | | | messed up
| | * | Merge remote-tracking branch 'upstream/master'zottel2015-09-2967-3014/+137292
| | |\ \ | | |/ / | |/| |
| * | | fix typo in 0b1cd826b05b6ec9637e373735967a2555eeb1d4Mario Vavti2015-09-291-1/+1
| | | |
| * | | do not store a recalled mail if we can not find the original midMario Vavti2015-09-291-0/+6
|/ / /
* | | remove debuggingredmatrix2015-09-281-4/+1
| | |
* | | add one more level of parentheses to ensure operator precedence is correctly ↵redmatrix2015-09-282-4/+4
| | | | | | | | | | | | evaluated
* | | check public scopes against visitor in item_permissions_sql()redmatrix2015-09-282-3/+38
| | |
* | | resolve conflictsredmatrix2015-09-282-10/+0
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-283-1/+11
|\ \ \ | | |/ | |/|
| * | process_delivery: ignore selfredmatrix2015-09-284-3/+13
| | |
* | | ignore self delivery in process_deliveryredmatrix2015-09-281-7/+5
| | |
* | | Merge branch 'deadsite'redmatrix2015-09-2816-29/+99
|\ \ \
| * | | typoredmatrix2015-09-281-2/+2
| | | |
| * | | create site records for all queued sites and check for deathredmatrix2015-09-289-21/+68
| | | |
| * | | add site_type to queries, first few - several more to go.redmatrix2015-09-283-5/+9
| | | |
| * | | schema support for additional site typesredmatrix2015-09-284-3/+22
| | | |
* | | | a clear is needed after floatingMario Vavti2015-09-281-1/+1
| | | |
* | | | private mail: bring additional inbox/outbox views and ajaxify single message ↵Mario Vavti2015-09-287-32/+39
|/ / / | | | | | | | | | drop
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-271-4/+6
|\| | | | | | | | | | | | | | Conflicts: include/zot.php
| * | well there's one problem...redmatrix2015-09-271-4/+4
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-275-2795/+2335
|\| | | | | | | | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-272-31/+31
| |\ \
| | * | Another Spanish updatejeroenpraat2015-09-252-31/+31
| | | |
| * | | add some safety checks on the sending side of syncredmatrix2015-09-273-30/+44
| |/ /
* | | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵redmatrix2015-09-2633-15/+134666
| | | | | | | | | | | | endless merge conflicts.
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-265-79/+33
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-09-2515-0/+0
| |\ \ \
| * | | | private mail: some work on conversations viewMario Vavti2015-09-255-79/+33
| | | | |