aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26 from anaqreon/logo-in-readmeredmatrix2015-09-052-3/+3
|\
| * Updating logo icon in Readme file and change markup heading for universality.Andrew Manning2015-08-152-3/+3
* | Merge pull request #35 from redmatrix/jeroenpraat-patch-1redmatrix2015-09-051-1/+1
|\ \
| * | Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla...jeroenpraat2015-09-041-1/+1
|/ /
* | fix typos before pushing0.9redmatrix2015-09-031-1/+1
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-030-0/+0
|\ \
| * | export chatroomsredmatrix2015-09-031-0/+6
* | | import and sync chatroomsredmatrix2015-09-036-4/+114
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-5/+7
|\| |
| * | channel export - don't include linked resource items (photos, events). These ...redmatrix2015-09-031-2/+4
* | | profile import error #34redmatrix2015-09-031-3/+2
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-3/+2
|\| |
| * | in this case no results is not an errorredmatrix2015-09-031-3/+2
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-033-13/+20
|\| |
| * | revision updateredmatrix2015-09-031-1/+1
| * | Merge pull request #390 from zzottel/masterredmatrix2015-09-042-12/+19
| |\ \
| | * | fix update 1148zottel2015-09-032-12/+19
| |/ /
* | | bug reporting docredmatrix2015-09-032-0/+32
* | | app syncredmatrix2015-09-023-2/+91
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-023-3/+15
|\| |
| * | more adjustment to apps containersredmatrix2015-09-021-2/+3
| * | sort out some app display weirdnessredmatrix2015-09-023-3/+14
| * | increase height of app-container so edit controls aren't shadowedredmatrix2015-09-021-1/+1
* | | add timestamps for syncing appsredmatrix2015-09-024-6/+35
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-022-3/+11
|\| |
| * | dummy updateredmatrix2015-09-022-3/+11
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-023-5/+8
|\| |
| * | sync "things" (obj elements)redmatrix2015-09-021-0/+28
| * | Update the creditsredmatrix2015-09-022-5/+7
| * | protect from sql injectionredmatrix2015-09-022-2/+2
* | | start to modularise the clone import and sync functionsredmatrix2015-09-025-204/+386
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-4/+3
|\| |
| * | Merge pull request #389 from zzottel/masterredmatrix2015-09-031-2/+2
| |\ \
| | * | really fix post filteringzottel2015-09-021-2/+2
| |/ /
* | | obscure mail subject in conversation structureredmatrix2015-09-011-1/+10
* | | import appsredmatrix2015-09-011-0/+23
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-0/+7
|\| |
| * | export appsredmatrix2015-09-011-0/+7
* | | initial work on obj import, rename import_profile_photo to import_xchan_photo...redmatrix2015-09-0110-31/+44
* | | match the redmatrix output format for objects (which is the hubzilla table fo...redmatrix2015-09-011-6/+2
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-1/+9
|\| |
| * | add the baseurl so we can easily relocate objectsredmatrix2015-09-011-1/+2
| * | use different obj export output format for hubzilla compatibilityredmatrix2015-09-011-1/+8
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-012-426/+614
|\| |
| * | cert updatesredmatrix2015-09-013-427/+615
* | | provide consistent ui for thingsredmatrix2015-09-015-7/+36
* | | more work on objs/thingsredmatrix2015-09-011-30/+26
* | | issue #31redmatrix2015-09-011-1/+1
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-0116-0/+0
|\ \ \
| * | | Updated all 300px default profile photos to 300px. Most using the SVG source,...jeroenpraat2015-09-0116-0/+0