aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-272-31/+31
|\
| * Another Spanish updatejeroenpraat2015-09-252-31/+31
| |
* | add some safety checks on the sending side of syncredmatrix2015-09-273-30/+44
|/
* dummy updateredmatrix2015-09-233-3/+7
|
* problems with extended item import and signaturesredmatrix2015-09-221-3/+62
|
* don't send sync packets to deleted hubloc locationsredmatrix2015-09-221-2/+4
|
* inverted logic syncing deleted hublocsredmatrix2015-09-221-1/+1
|
* add names to delivery report for sync deliveryredmatrix2015-09-221-1/+3
|
* report the channel syncredmatrix2015-09-221-1/+11
|
* backport item syncredmatrix2015-09-222-2/+91
|
* dummy updateredmatrix2015-09-223-3/+7
|
* issue #52 - try all matching hublocs for remote auth, not just the "best one".redmatrix2015-09-212-129/+136
|
* new delivery report formatredmatrix2015-09-202-13/+42
|
* improve on the last attemptredmatrix2015-09-201-4/+4
|
* catch the timestamp alsoredmatrix2015-09-201-1/+1
|
* remove system flags from channel import packetredmatrix2015-09-201-5/+9
|
* we need the xchan record alsoredmatrix2015-09-201-1/+1
|
* initial checkin delivery report classredmatrix2015-09-202-1/+47
|
* clone new connection requestsredmatrix2015-09-192-19/+20
|
* include site identitfier on redmatrix delivery reports alsoredmatrix2015-09-181-0/+2
|
* 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
|/
* 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 ↵redmatrix2015-09-114-205/+221
| | | | allow the descendant channel to survive
* 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 strings
| | * Updated Italian stringsPaolo Tacconi2015-09-072-376/+387
| | |
* | | sync posted top level items rather than deliver them (actually we do both, ↵redmatrix2015-09-071-3/+30
|/ / | | | | | | but sync comes first). This way we get the ACL transferred.
* | 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 ↵redmatrix2015-09-073-182/+182
|/ / | | | | | | checking with an observer.