Commit Graph

13993 Commits

Author SHA1 Message Date
redmatrix
efcb4abfd0 improve on the last attempt 2015-09-20 18:08:06 -07:00
redmatrix
59a56ac77f catch the timestamp also 2015-09-20 17:47:41 -07:00
redmatrix
35f09f4f74 remove system flags from channel import packet 2015-09-20 17:45:23 -07:00
redmatrix
9de8df496a we need the xchan record also 2015-09-20 16:52:21 -07:00
redmatrix
77df590f65 initial checkin delivery report class 2015-09-20 00:27:25 -07:00
redmatrix
f4a4cf1402 clone new connection requests 2015-09-19 15:36:07 -07:00
redmatrix
9ed8eac8c6 include site identitfier on redmatrix delivery reports also 2015-09-18 23:02:03 -07:00
redmatrix
7c8706757d Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-18 22:44:23 -07:00
redmatrix
3dc066a143 dummy update 2015-09-18 22:43:35 -07:00
jeroenpraat
582607c0f0 Another (hopefully final) Spanish update 2015-09-17 16:28:31 +02:00
Mario Vavti
b7e953f50e fix calculation of content height with margins 2015-09-17 14:14:01 +02:00
redmatrix
f2104b0a5a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-16 21:57:21 -07:00
redmatrix
84b004399e push revision 2015-09-16 21:56:55 -07:00
jeroenpraat
b87d164f2f Cleaned some wrong metadata from PNG files. 2015-09-15 21:50:49 +02:00
jeroenpraat
31db5078c1 Small update Spanish strings 2015-09-14 16:36:06 +02:00
Mario Vavti
40c78d23e6 quick fix for choklet bannertwo 2015-09-14 09:27:15 +02:00
redmatrix
fc58b8cc0d log the remote message if there was one 2015-09-11 14:56:31 -07:00
redmatrix
e062c4e6b5 another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive 2015-09-11 14:30:07 -07:00
redmatrix
05e0ed5173 export likes to clones 2015-09-10 19:17:20 -07:00
redmatrix
9cee52c668 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-10 16:49:09 -07:00
redmatrix
50e32c3d8a zot_refresh: always try the hubloc pointed to by xchan_addr first 2015-09-10 16:48:08 -07:00
jeroenpraat
672143d3a2 update Spanish strings 2015-09-10 13:18:24 +02:00
redmatrix
e6690c818d export TERM_FILE when mirroring 2015-09-08 19:13:43 -07:00
redmatrix
d413b6eba8 merge conflicts 2015-09-08 18:45:58 -07:00
redmatrix
50d7554ccd add sync packets for menus 2015-09-08 18:40:19 -07:00
redmatrix
1ebaacfd5e menu export 2015-09-08 17:50:24 -07:00
redmatrix
11e19a06b7 export events 2015-09-07 22:54:43 -07:00
redmatrix
f84946c135 minor fix to event sync 2015-09-07 21:00:54 -07:00
redmatrix
c39e3613a8 create event sync packets 2015-09-07 20:28:02 -07:00
redmatrix
5751437c93 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 18:13:17 -07:00
redmatrix
9fa0490c44 sync posted top level items rather than deliver them (actually we do both, but sync comes first). This way we get the ACL transferred. 2015-09-07 18:11:30 -07:00
Habeas Codice
6711ceb662 fix postgres zotfeed 2015-09-07 16:28:42 -07:00
Wave
dc7677f5fa Merge pull request #391 from tuscanhobbit/master
Updated Italian strings
2015-09-07 17:29:13 +02:00
Paolo Tacconi
78fb6f55ed Updated Italian strings 2015-09-07 17:24:43 +02:00
redmatrix
5d59462e49 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 04:04:15 -07:00
redmatrix
1b09c64856 PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer. 2015-09-07 03:59:38 -07:00
Mario Vavti
ee21d87d1b uexport template fixes 2015-09-04 09:33:34 +02:00
redmatrix
f7d9523c7d export chatrooms 2015-09-03 18:43:44 -07:00
redmatrix
2a7ff3018b channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked. 2015-09-03 17:21:20 -07:00
redmatrix
e1af81ea55 in this case no results is not an error 2015-09-03 15:48:01 -07:00
redmatrix
90d48d60d8 revision update 2015-09-03 13:10:03 -07:00
redmatrix
48c0efd20e Merge pull request #390 from zzottel/master
fix update 1148
2015-09-04 06:09:26 +10:00
zottel
5cef672f9a fix update 1148 2015-09-03 13:55:47 +02:00
redmatrix
945ba5d788 more adjustment to apps containers 2015-09-02 21:46:19 -07:00
redmatrix
3e7edf504d sort out some app display weirdness 2015-09-02 21:35:49 -07:00
redmatrix
3285c71995 increase height of app-container so edit controls aren't shadowed 2015-09-02 21:17:23 -07:00
redmatrix
2018b88093 dummy update 2015-09-02 20:53:26 -07:00
redmatrix
470915a55b sync "things" (obj elements) 2015-09-02 20:07:15 -07:00
redmatrix
d9a67d64b1 Update the credits 2015-09-02 18:04:22 -07:00
redmatrix
2a26c898ca protect from sql injection 2015-09-02 15:52:54 -07:00