aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'zottel2015-09-1925-25/+144
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-181-1/+1
| |\
| | * include site identitfier on redmatrix delivery reports alsoredmatrix2015-09-181-0/+2
| * | DB table for delivery reportsredmatrix2015-09-183-1/+86
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-188-14/+21
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-185-11/+14
| | |\
| | | * Another (hopefully final) Spanish updatejeroenpraat2015-09-172-5/+5
| | | * fix calculation of content height with marginsMario Vavti2015-09-173-6/+9
| | * | dummy updateredmatrix2015-09-184-8/+12
| | |/
| * | add reporting site to delivery reportredmatrix2015-09-183-1/+7
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-188-1/+8
| |\ \
| | * | css fixesMario Vavti2015-09-188-1/+8
| * | | more work on surviving hub re-installsredmatrix2015-09-182-4/+8
| |/ /
| * | change photo permissions when attach permissions are changed through mod/file...redmatrix2015-09-183-4/+14
* | | Merge remote-tracking branch 'upstream/master'zottel2015-09-1820-361/+392
|\| |
| * | start hooking in the new webfinger/zot merged discoveryredmatrix2015-09-171-6/+10
| * | consolidate zotfinger and webfingerredmatrix2015-09-175-291/+299
| * | Converse width for a few related (old) schemas back to 1024px / Name default ...jeroenpraat2015-09-176-6/+15
| * | missing refernce to arrayMario Vavti2015-09-171-1/+1
| * | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-09-173-5/+5
| |\ \
| | * \ Merge pull request #46 from anaqreon/mastergit-marijus2015-09-173-5/+5
| | |\ \
| | | * | Corrected some missing space typos in docsAndrew Manning2015-09-173-5/+5
| * | | | quickfix for private messages - needs a lot more workMario Vavti2015-09-175-48/+56
| |/ / /
| * / / Revert "moved submit button to the bottom in settings.tpl"Mario Vavti2015-09-171-5/+7
| |/ /
* | | Merge remote-tracking branch 'upstream/master'zottel2015-09-1711-66/+61
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-161-1/+1
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-1612-197/+199
| | |\
| | * | push revisionredmatrix2015-09-161-1/+1
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-160-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Cleaned some wrong metadata from PNG files.jeroenpraat2015-09-159-0/+0
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-166-47/+45
| |\ \ \
| | * \ \ Merge pull request #45 from anaqreon/masterredmatrix2015-09-174-35/+35
| | |\ \ \
| | | * | | Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzi...Andrew Manning2015-09-164-35/+35
| | |/ / /
| | * | | Merge pull request #44 from mrjive/move_submit_buttonredmatrix2015-09-171-7/+5
| | |\ \ \
| | | * | | moved submit button to the bottom in settings.tplmrjive2015-09-161-7/+5
| | * | | | Merge pull request #43 from mrjive/toggleselectredmatrix2015-09-171-5/+5
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | added toggle_selectmrjive2015-09-161-5/+5
| | |/ / /
| * / / / change matrix to grid, begin webfinger optimisationredmatrix2015-09-164-18/+15
| |/ / /
* | | | Merge remote-tracking branch 'upstream/master'zottel2015-09-1633-247/+314
|\| | |
| * | | serve as application/xrd+xmlredmatrix2015-09-152-2/+2
| * | | italian string correctionredmatrix2015-09-151-1/+1
| * | | Less marginjeroenpraat2015-09-153-0/+0
| * | | Made the favicons a bit sharper (direct from SVG) and cleaned some wrong meta...jeroenpraat2015-09-1515-0/+0
| * | | make sure we've got a doc typeredmatrix2015-09-151-1/+1
| * | | I'm not going to tell you what's wrong because I'll be accused of bashing ano...redmatrix2015-09-153-1/+3
| * | | personaredmatrix2015-09-141-0/+1
| * | | nitredmatrix2015-09-141-1/+1
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-142-194/+194
| |\| |
| | * | Small update Spanish stringsjeroenpraat2015-09-142-194/+194
| | * | quick fix for choklet bannertwoMario Vavti2015-09-141-3/+5
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 03:29:26 +0000