aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-196-3/+3
|\
| * Merge pull request #93 from tuscanhobbit/masterredmatrix2015-10-205-2/+2
| |\
| | * Replaced some old redmatrix brandingPaolo Tacconi2015-10-195-2/+2
| | * Merge pull request #1 from redmatrix/masterWave2015-10-19112-40350/+43079
| | |\
| * | | fix typo in mod/connedit.phpMario Vavti2015-10-191-1/+1
| * | | fix typo in include/notifier.phpMario Vavti2015-10-191-1/+1
| | |/ | |/|
* / | syntax errorredmatrix2015-10-191-1/+1
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-182-4/+33
|\ \
| * \ Merge pull request #92 from HaakonME/masterredmatrix2015-10-192-4/+33
| |\ \
| | * | Updated help page about Hubzilla on OpenShift with new info on using mysqlche...Haakon Meland Eriksen2015-10-181-1/+1
| | * | Updated help page about Hubzilla on OpenShift with new info on using mysqlche...Haakon Meland Eriksen2015-10-181-3/+25
| | * | Added config settings sensible for Hubzilla on OpenShift - fixesHaakon Meland Eriksen2015-10-181-1/+1
| | * | Added config settings sensible for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-181-1/+8
* | | | separate permission_update notification into permission_create and permission...redmatrix2015-10-184-7/+11
|/ / /
* | | issues with "the Register" feedredmatrix2015-10-181-1/+1
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-185-3496/+3501
|\ \ \
| * | | Update nl+esjeroenpraat2015-10-184-3494/+3500
| |/ /
| * | tweak justify gallery options to not load to large previewsMario Vavti2015-10-181-2/+1
* | | re-organise the protocol disabled logicredmatrix2015-10-181-8/+18
|/ /
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-172-0/+9152
|\ \
| * | start pointing people to hubzilla instead of redmatrixredmatrix2015-10-171-1/+5
| * | messages.po got truncated due to a failed cron jobredmatrix2015-10-171-0/+9151
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-175-16591/+7669
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-172-6865/+6775
| |\ \
| | * | Update Dutch stringsjeroenpraat2015-10-162-6865/+6775
| * | | allow homepage content to be a full redirectredmatrix2015-10-173-8999/+5
| |/ /
* | | 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