aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix calculation of content height with marginsMario Vavti2015-09-173-6/+9
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-1612-197/+199
|\
| * Cleaned some wrong metadata from PNG files.jeroenpraat2015-09-159-0/+0
| * Small update Spanish stringsjeroenpraat2015-09-142-194/+194
| * quick fix for choklet bannertwoMario Vavti2015-09-141-3/+5
* | push revisionredmatrix2015-09-161-1/+1
|/
* log the remote message if there was oneredmatrix2015-09-111-1/+4
* another tactic to deal with orphan hublocs from re-installs, or at least allo...redmatrix2015-09-114-205/+221
* export likes to clonesredmatrix2015-09-101-1/+15
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-102-463/+463
|\
| * update Spanish stringsjeroenpraat2015-09-102-463/+463
* | zot_refresh: always try the hubloc pointed to by xchan_addr firstredmatrix2015-09-102-4/+13
|/
* export TERM_FILE when mirroringredmatrix2015-09-082-1/+7
* merge conflictsredmatrix2015-09-082-2/+2
* add sync packets for menusredmatrix2015-09-083-1/+19
* menu exportredmatrix2015-09-082-2/+12
* export eventsredmatrix2015-09-071-0/+19
* minor fix to event syncredmatrix2015-09-071-9/+13
* create event sync packetsredmatrix2015-09-072-0/+33
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-073-380/+393
|\
| * fix postgres zotfeedHabeas Codice2015-09-071-4/+6
| * Merge pull request #391 from tuscanhobbit/masterWave2015-09-072-376/+387
| |\
| | * Updated Italian stringsPaolo Tacconi2015-09-072-376/+387
* | | sync posted top level items rather than deliver them (actually we do both, bu...redmatrix2015-09-071-3/+30
|/ /
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-6/+9
|\ \
| * | uexport template fixesMario Vavti2015-09-041-6/+9
* | | PRIVACY: item_private seems to have been removed from permissions_sql checkin...redmatrix2015-09-073-182/+182
|/ /
* | export chatroomsredmatrix2015-09-031-0/+6
* | channel export - don't include linked resource items (photos, events). These ...redmatrix2015-09-031-2/+4
* | in this case no results is not an errorredmatrix2015-09-031-3/+2
* | revision updateredmatrix2015-09-031-1/+1
* | Merge pull request #390 from zzottel/masterredmatrix2015-09-042-12/+19
|\ \
| * | fix update 1148zottel2015-09-032-12/+19
|/ /
* | 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
* | dummy updateredmatrix2015-09-022-3/+11
* | sync "things" (obj elements)redmatrix2015-09-021-0/+28
* | Update the creditsredmatrix2015-09-022-5/+7
* | protect from sql injectionredmatrix2015-09-022-2/+2
* | Merge pull request #389 from zzottel/masterredmatrix2015-09-031-2/+2
|\ \
| * | really fix post filteringzottel2015-09-021-2/+2
|/ /
* | export appsredmatrix2015-09-011-0/+7
* | 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
* | cert updatesredmatrix2015-09-013-427/+615
* | dummy update placeholderredmatrix2015-09-013-3/+10
* | typo in sqlredmatrix2015-08-311-1/+1
* | 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