aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bring back chat expiration setting and adjust chat size for our now smaller c...redmatrix2015-10-173-1/+6
* filter delivery reportsredmatrix2015-10-172-9/+53
* remove one more Friendica table reference from the APIredmatrix2015-10-161-29/+15
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-164-37/+38
|\
| * we now provide images for all suffixes (0-3) -> simplify photo item body crea...Mario Vavti2015-10-162-37/+27
| * Merge pull request #90 from anaqreon/theme-docredmatrix2015-10-162-0/+11
| |\
| | * Updated textAndrew Manning2015-10-161-0/+1
| | * Updated formatting and typosAndrew Manning2015-10-161-5/+1
| | * New documentation for theme repo managementAndrew Manning2015-10-162-0/+14
* | | change setup defaults to 127.0.0.1 instead of localhost for DB server, add do...redmatrix2015-10-162-4/+9
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-161-4/+1
|\ \
| * | this is all the info we needMario Vavti2015-10-161-4/+1
| |/
* / another try at issue #89 - rotating photosredmatrix2015-10-163-1347/+1374
|/
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-150-0/+0
|\
| * missed the xchan_mail_queryredmatrix2015-10-151-4/+2
* | missing xchan_mail_queryredmatrix2015-10-151-0/+1
* | mail sync debuggingredmatrix2015-10-152-12/+60
* | mail sync/migrate continued; also abstract delivery loop to make it re-usable...redmatrix2015-10-159-95/+115
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-155-8/+39
|\|
| * dummy updateredmatrix2015-10-153-3/+7
* | generate all (non-square) photo scales - even if the original photo is smalle...redmatrix2015-10-154-61/+66
* | issue #89 - rotating photos does not workredmatrix2015-10-151-1/+2
* | fix webpagesMario Vavti2015-10-151-1/+1
* | really fix label nameMario Vavti2015-10-151-1/+6
* | wrong logicMario Vavti2015-10-151-1/+1
* | fix label nameMario Vavti2015-10-151-5/+2
* | reflect default image size changes in mod/photosMario Vavti2015-10-151-3/+17
* | do not try to remove photos twiceMario Vavti2015-10-151-0/+6
* | (re)add default image-size 320px - it is good for gallery preview. this size ...Mario Vavti2015-10-152-3/+12
* | update conv_list.tplMario Vavti2015-10-151-19/+33
* | double up default photo sizes - even the mos simple camera can now do images ...Mario Vavti2015-10-153-8/+9
* | if photo deleted from /cloud or /dav also delete from /photosMario Vavti2015-10-151-0/+5
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-1513-31/+118
|\ \
| * \ Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-143-4/+4
| |\ \
| | * \ Merge pull request #88 from anaqreon/grid-appredmatrix2015-10-153-4/+4
| | |\ \
| | | * | Replaced RedMatrix icon and label in app listAndrew Manning2015-10-143-4/+4
| * | | | change name of matrix appredmatrix2015-10-141-1/+1
| |/ / /
| * | | more mail sync workredmatrix2015-10-142-8/+7
| * | | more work on import & sync of private mail and conversationsredmatrix2015-10-143-1/+78
| * | | issue #87 - photos not getting deleted from mod_photo when deleted in DAV or ...redmatrix2015-10-142-3/+14
| * | | issue #86 - like/dislike in photos not workingredmatrix2015-10-144-14/+14
* | | | updating the local item only does not make much sense in this caseMario Vavti2015-10-141-2/+1
* | | | wrong variableMario Vavti2015-10-141-1/+1
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-145-4196/+4174
|\| | |
| * | | issue #82 - args not defined (should be arr)redmatrix2015-10-141-1/+1
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-144-630/+656
| |\ \ \
| * | | | port of mail encodingredmatrix2015-10-141-8/+8
| * | | | 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