aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1439-7676/+8564
|\
| * bring back opacity for archived contactsMario Vavti2016-01-141-0/+5
| * some work on connectionsMario Vavti2016-01-145-190/+79
| * some template work on follow widgetMario Vavti2016-01-144-17/+11
| * more progress on cover photo cropping and storageredmatrix2016-01-132-4/+395
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-131-1/+1
| |\
| | * fix sharing of photo itemsMario Vavti2016-01-131-1/+1
| * | some initial work on uploading and cropping cover photosredmatrix2016-01-136-2/+121
| |/
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-131-1/+1
| |\
| | * 20em is to big for mobile useMario Vavti2016-01-131-1/+1
| * | more work on auto channel creation during registerredmatrix2016-01-134-1/+116
| |/
| * very small tweaks to CLI plugin manager utilityredmatrix2016-01-132-6/+8
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-121-2/+2
| |\
| | * Correct docs.ken restivo2016-01-121-2/+2
| * | cleanup text in INSTALL.txtredmatrix2016-01-121-13/+25
| |/
| * cli utility for managing addonsredmatrix2016-01-121-0/+130
| * 'auto channel creation' - if the corresponding config variable is set, create...redmatrix2016-01-128-26/+97
| * Source the conf.ken restivo2016-01-121-0/+3
| * Add very simple, minimalist posting shell script.ken restivo2016-01-121-0/+33
| * "aconfig" or account configuration storage, needed for some upcoming work. Bu...redmatrix2016-01-111-0/+19
| * logic reversal in version checkingredmatrix2016-01-111-3/+3
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-113-7418/+7437
| |\
| | * Update README.mdJeroen van Riet Paap2016-01-111-4/+4
| | * centerJeroen van Riet Paap2016-01-111-0/+4
| | * point to installation docuJeroen van Riet Paap2016-01-111-1/+4
| | * Merge pull request #253 from wave72/masterWave2016-01-112-7417/+7429
| | |\
| | | * Italian strings updatedPaolo Tacconi2016-01-112-7417/+7429
| * | | plugin version compatibility checking. To use, set MinVersion, MaxVersion or ...redmatrix2016-01-115-11/+97
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1116-19556/+20729
|\| |
| * | revert lost linkredmatrix2016-01-101-0/+1
| * | Merge pull request #252 from einervonvielen/homeinstallredmatrix2016-01-114-1/+1118
| |\ \
| | * | Added files for installation scriptEiner von Vielen2016-01-103-0/+1118
| | * | indexedEiner von Vielen2016-01-101-1/+0
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-108-14838/+14864
| |\ \ \
| | * | | String update es-es and nl. Plus some extra bits, incl .gitignore update with...jeroenpraat2016-01-108-14838/+14864
| * | | | the mail_isreply flag wasn't being set in the right casesredmatrix2016-01-102-4/+7
| |/ / /
| * / / add locked features to siteinfo to assist in debuggingredmatrix2016-01-091-1/+13
| |/ /
| * | fix relative urls on some Diaspora profile photosredmatrix2016-01-093-4713/+4727
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-098-25/+51
|\| |
| * | issue #251redmatrix2016-01-071-2/+1
| * | provide admin toggle to disable delivery reportsredmatrix2016-01-074-2/+7
| * | optional support for public key pinningredmatrix2016-01-071-0/+7
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-071-20/+20
| |\ \
| | * | Merge pull request #250 from wave72/masterredmatrix2016-01-081-20/+20
| | |\|
| | | * Wrong branding in Translations docWave722016-01-071-15/+15
| | | * In Hubzilla messages.po is hmessages.poWave722016-01-071-6/+6
| * | | extra security headers, revert or fix if functionality is blockedredmatrix2016-01-072-1/+16
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-077-16/+125
|\| |
| * | version roll1.1redmatrix2016-01-061-2/+2
| * | features management page for hubminsredmatrix2016-01-065-1/+108