aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13 from redmatrix/mastermrjive2016-01-1010-4738/+4790
|\
| * 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
| * 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 pull request #12 from redmatrix/mastermrjive2016-01-0712-32/+159
|\| |
| * | version roll1.1redmatrix2016-01-061-2/+2
| * | features management page for hubminsredmatrix2016-01-065-1/+108
| * | provide an option to toggle the view of locked features so we can use the sam...redmatrix2016-01-052-14/+16
| * | make 'refresh permissions' do something useful for non-zot connectionsredmatrix2016-01-041-3/+9
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-043-111/+123
| |\ \
| | * \ Merge pull request #249 from chris1315/patch-5ken restivo2016-01-041-0/+12
| | |\ \
| | | * | main.bbchris13152016-01-041-0/+12
| | |/ /
| * | | expire delivery reports at 10 days by default instead of 30.redmatrix2016-01-043-13/+13
* | | | Merge pull request #11 from redmatrix/mastermrjive2016-01-0411-191/+261
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #248 from wave72/masterWave2016-01-042-111/+111
| |\ \ \ | | |/ / | |/| / | | |/
| | * Updated Italian stringsPaolo Tacconi2016-01-042-111/+111
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-046-16/+57
| |\ \
| | * \ Merge pull request #246 from HaakonME/HaakonME-Hubzilla-on-OpenShift-Hubzilla...redmatrix2016-01-041-0/+5
| | |\ \
| | | * | Hubzilla Chess - single file commit to upstreamHaakon Meland Eriksen2016-01-031-1/+1
| | | * | Add Hubzilla Chess repo to deploy scriptHaakon Meland Eriksen2016-01-031-0/+5
| | * | | Merge pull request #247 from chris1315/patch-3redmatrix2016-01-041-0/+25
| | |\ \ \
| | | * | | Create about.bbchris13152016-01-031-0/+25
| | | |/ /
| | * | | forgot to add this to the docujeroenpraat2016-01-031-2/+2
| | * | | added some real examples for the default-permission-role in de docu. also upd...jeroenpraat2016-01-033-14/+25
| | |/ /
| * | | version script was all screwed upredmatrix2016-01-041-1/+1
| * | | Provide a mechanism for a hub admin to lock features in the on or off state. ...redmatrix2016-01-042-63/+92
| |/ /
* | | Merge pull request #10 from redmatrix/mastermrjive2016-01-03705-126165/+39274
|\| |
| * | Provide the ability for a hub admin to specify a default permissions role for...redmatrix2016-01-023-4/+23
| * | Update es+nl strings and added title on hover for items (needed to view title...jeroenpraat2016-01-027-212/+224
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-012-1/+74
| |\ \
| | * \ Merge pull request #245 from chris1315/patch-2redmatrix2016-01-021-0/+73
| | |\ \
| | | * | Create git_for_non_developers.bbchris13152016-01-011-0/+73
| | * | | Merge pull request #244 from anaqreon/anaqreon-titel-typoredmatrix2016-01-021-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Misspelled TitelAndrew Manning2016-01-011-1/+1
| | |/ /
| * / / issue #241 (redmatrix issue 405)redmatrix2016-01-016-100/+112
| |/ /
| * | more issue #239redmatrix2015-12-311-1/+1
| * | issue #239, provide 'Public' text on ACL selector when appropriate to do so.redmatrix2015-12-313-14/+16
| * | yearly license updateredmatrix2015-12-312-1/+2
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-314-58/+47
| |\ \
| | * | nl+es-es string updatejeroenpraat2015-12-294-58/+47
| * | | comment clarificationredmatrix2015-12-311-1/+1
| * | | log API improvements and queue optimisation for singleton networksredmatrix2015-12-317-49/+87
| |/ /
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-291-1/+1
| |\ \