aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* issue #51redmatrix2015-09-213-5/+24
|
* looks like chat has been neglected a bit recentlyredmatrix2015-09-206-8/+7
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-13/+43
|\ | | | | | | | | Conflicts: include/zot.php
| * new delivery report formatredmatrix2015-09-202-13/+42
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-3/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * improve on the last attemptredmatrix2015-09-201-4/+4
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-4/+13
|\| | | | | | | | | Conflicts: include/zot.php
| * catch the timestamp alsoredmatrix2015-09-201-1/+1
| |
| * remove system flags from channel import packetredmatrix2015-09-201-5/+9
| |
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-201-1/+1
|\ \
| * | kick right aside out a little earlierMario Vavti2015-09-201-1/+1
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-1/+1
|\ \ \ | |/ / |/| / | |/ | | Conflicts: include/zot.php
| * we need the xchan record alsoredmatrix2015-09-201-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-1/+47
|\|
| * initial checkin delivery report classredmatrix2015-09-202-1/+47
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-192-1/+2
|\| | | | | | | | | Conflicts: include/zot.php
| * clone new connection requestsredmatrix2015-09-192-19/+20
| |
* | clone new connectionsredmatrix2015-09-191-17/+18
| |
* | 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
|\| | | | | | | | | Conflicts: util/messages.po
| * 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 ↵redmatrix2015-09-183-4/+14
| | | | | | | | mod/filestorage, and fix lockview for photos.
* | 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
| | | | | | | | theme to Focus / Non expert custom display settings above expert display settings, so people can better find them.
* | 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 docs
| | * | 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
|/ / | | | | | | This reverts commit 1500691cc22443aac9bb6af409f8bbd64787a9e9.
* | 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 wi…
| | * | | Started correcting vestiges of the RedMatrix and matrix, replacing with ↵Andrew Manning2015-09-164-35/+35
| |/ / / | | | | | | | | | | | | Hubzilla and grid
| * | | Merge pull request #44 from mrjive/move_submit_buttonredmatrix2015-09-171-7/+5
| |\ \ \ | | | | | | | | | | moved submit button to the bottom in settings.tpl
| | * | | moved submit button to the bottom in settings.tplmrjive2015-09-161-7/+5
| | | | |