Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | we need the xchan record also | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | |||||
* | initial checkin delivery report class | redmatrix | 2015-09-20 | 2 | -1/+47 |
| | |||||
* | clone new connection requests | redmatrix | 2015-09-19 | 2 | -19/+20 |
| | |||||
* | include site identitfier on redmatrix delivery reports also | redmatrix | 2015-09-18 | 1 | -0/+2 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 5 | -11/+14 |
|\ | |||||
| * | Another (hopefully final) Spanish update | jeroenpraat | 2015-09-17 | 2 | -5/+5 |
| | | |||||
| * | fix calculation of content height with margins | Mario Vavti | 2015-09-17 | 3 | -6/+9 |
| | | |||||
* | | dummy update | redmatrix | 2015-09-18 | 4 | -8/+12 |
|/ | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-16 | 12 | -197/+199 |
|\ | |||||
| * | Cleaned some wrong metadata from PNG files. | jeroenpraat | 2015-09-15 | 9 | -0/+0 |
| | | |||||
| * | Small update Spanish strings | jeroenpraat | 2015-09-14 | 2 | -194/+194 |
| | | |||||
| * | quick fix for choklet bannertwo | Mario Vavti | 2015-09-14 | 1 | -3/+5 |
| | | |||||
* | | push revision | redmatrix | 2015-09-16 | 1 | -1/+1 |
|/ | |||||
* | log the remote message if there was one | redmatrix | 2015-09-11 | 1 | -1/+4 |
| | |||||
* | another tactic to deal with orphan hublocs from re-installs, or at least ↵ | redmatrix | 2015-09-11 | 4 | -205/+221 |
| | | | | allow the descendant channel to survive | ||||
* | export likes to clones | redmatrix | 2015-09-10 | 1 | -1/+15 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-10 | 2 | -463/+463 |
|\ | |||||
| * | update Spanish strings | jeroenpraat | 2015-09-10 | 2 | -463/+463 |
| | | |||||
* | | zot_refresh: always try the hubloc pointed to by xchan_addr first | redmatrix | 2015-09-10 | 2 | -4/+13 |
|/ | |||||
* | export TERM_FILE when mirroring | redmatrix | 2015-09-08 | 2 | -1/+7 |
| | |||||
* | merge conflicts | redmatrix | 2015-09-08 | 2 | -2/+2 |
| | |||||
* | add sync packets for menus | redmatrix | 2015-09-08 | 3 | -1/+19 |
| | |||||
* | menu export | redmatrix | 2015-09-08 | 2 | -2/+12 |
| | |||||
* | export events | redmatrix | 2015-09-07 | 1 | -0/+19 |
| | |||||
* | minor fix to event sync | redmatrix | 2015-09-07 | 1 | -9/+13 |
| | |||||
* | create event sync packets | redmatrix | 2015-09-07 | 2 | -0/+33 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 3 | -380/+393 |
|\ | |||||
| * | fix postgres zotfeed | Habeas Codice | 2015-09-07 | 1 | -4/+6 |
| | | |||||
| * | Merge pull request #391 from tuscanhobbit/master | Wave | 2015-09-07 | 2 | -376/+387 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2015-09-07 | 2 | -376/+387 |
| | | | |||||
* | | | sync posted top level items rather than deliver them (actually we do both, ↵ | redmatrix | 2015-09-07 | 1 | -3/+30 |
|/ / | | | | | | | but sync comes first). This way we get the ACL transferred. | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -6/+9 |
|\ \ | |||||
| * | | uexport template fixes | Mario Vavti | 2015-09-04 | 1 | -6/+9 |
| | | | |||||
* | | | PRIVACY: item_private seems to have been removed from permissions_sql ↵ | redmatrix | 2015-09-07 | 3 | -182/+182 |
|/ / | | | | | | | checking with an observer. | ||||
* | | export chatrooms | redmatrix | 2015-09-03 | 1 | -0/+6 |
| | | |||||
* | | channel export - don't include linked resource items (photos, events). These ↵ | redmatrix | 2015-09-03 | 1 | -2/+4 |
| | | | | | | | | items will need to be provided with those objects so that they can be re-linked. | ||||
* | | in this case no results is not an error | redmatrix | 2015-09-03 | 1 | -3/+2 |
| | | |||||
* | | revision update | redmatrix | 2015-09-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #390 from zzottel/master | redmatrix | 2015-09-04 | 2 | -12/+19 |
|\ \ | | | | | | | fix update 1148 | ||||
| * | | fix update 1148 | zottel | 2015-09-03 | 2 | -12/+19 |
|/ / | |||||
* | | more adjustment to apps containers | redmatrix | 2015-09-02 | 1 | -2/+3 |
| | | |||||
* | | sort out some app display weirdness | redmatrix | 2015-09-02 | 3 | -3/+14 |
| | | |||||
* | | increase height of app-container so edit controls aren't shadowed | redmatrix | 2015-09-02 | 1 | -1/+1 |
| | | |||||
* | | dummy update | redmatrix | 2015-09-02 | 2 | -3/+11 |
| | | |||||
* | | sync "things" (obj elements) | redmatrix | 2015-09-02 | 1 | -0/+28 |
| | | |||||
* | | Update the credits | redmatrix | 2015-09-02 | 2 | -5/+7 |
| | | |||||
* | | protect from sql injection | redmatrix | 2015-09-02 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #389 from zzottel/master | redmatrix | 2015-09-03 | 1 | -2/+2 |
|\ \ | | | | | | | really fix post filtering | ||||
| * | | really fix post filtering | zottel | 2015-09-02 | 1 | -2/+2 |
|/ / | |||||
* | | export apps | redmatrix | 2015-09-01 | 1 | -0/+7 |
| | |