aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-012-2/+1
|\ \ \ | | |/ | |/|
| * | dummy update placeholderredmatrix2015-09-013-3/+10
| * | typo in sqlredmatrix2015-08-311-1/+1
* | | separate objs/things from taxonomyredmatrix2015-09-019-50/+110
| |/ |/|
* | don't log the mundane - especially at normal levels.redmatrix2015-08-311-2/+3
* | this is a bit harder than anticipated.redmatrix2015-08-311-14/+15
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-3110-192/+224
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-315-272/+283
| |\
| | * Removed redmatrix.nl as a fallback server (directory mode to normal) + update...jeroenpraat2015-08-293-56/+55
| | * Update es and nl stringsjeroenpraat2015-08-284-245/+257