Commit graph

877 commits

Author SHA1 Message Date
redmatrix
5f80121637 add hubloc repair script (needed for deadsuperhero, probably temporary) 2015-10-30 22:43:38 -07:00
redmatrix
848e3f6c5d photos linked item visibility issue 2015-10-28 19:43:35 -07:00
Mario Vavti
f7601756e9 create photo object if feature large photos is enabled and display those slightly different 2015-10-20 09:36:15 +02:00
redmatrix
93f061f78a mail sync/migrate continued; also abstract delivery loop to make it re-usable, change refresh_all to use delivery loop. 2015-10-15 18:52:04 -07:00
Mario Vavti
b6eded1119 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-14 22:57:03 +02:00
redmatrix
f4e708a02f port of mail encoding 2015-10-14 13:19:28 -07:00
Mario Vavti
b4e83b6537 allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. 2015-10-14 22:14:19 +02:00
redmatrix
c7637a0c53 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-14 13:13:12 -07:00
redmatrix
732c6134dd support for mail sync 2015-10-14 13:11:24 -07:00
Mario Vavti
2a2da48d18 fix typo in 0b1cd826b0 2015-09-29 11:56:43 +02:00
Mario Vavti
0b1cd826b0 do not store a recalled mail if we can not find the original mid 2015-09-29 11:48:41 +02:00
redmatrix
7734bbfe4d problems with extended item import and signatures 2015-09-22 22:30:09 -07:00
redmatrix
1d7d9818fa Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/items.php
	include/zot.php
2015-09-22 16:26:28 -07:00
redmatrix
c2dcc68803 backport item sync 2015-09-22 16:19:08 -07:00
redmatrix
9baaa6fa56 issue #51 2015-09-21 20:05:54 -07:00
redmatrix
df0fa9883c check for empty word after trim 2015-09-12 14:37:55 -07:00
redmatrix
0a051ff2cd preserve code blocks on item import if channel has code rights. When importing the channel itself,
turn code access off unless this is the admin.
2015-09-08 22:46:34 -07:00
redmatrix
f13a8f725c export TERM_FILE when mirroring 2015-09-08 19:14:29 -07:00
redmatrix
e6690c818d export TERM_FILE when mirroring 2015-09-08 19:13:43 -07:00
redmatrix
4eec9a2fba Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
2015-09-07 18:20:47 -07:00
Habeas Codice
6711ceb662 fix postgres zotfeed 2015-09-07 16:28:42 -07:00
jeroenpraat
fc804751a2 Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla/include/items.php on line 3325
Please review if this is correct?
2015-09-04 12:39:47 +02:00
redmatrix
6cc60ba477 initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose. 2015-09-01 22:03:10 -07:00
redmatrix
a67213627c provide a comment_policy of "network: diaspora" to handle their special case public-posts-are-commentable-by-anybody permission without breaking any other permissions. 2015-08-23 18:48:33 -07:00
redmatrix
bf190be5b4 issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync 2015-08-23 13:27:34 -07:00
redmatrix
5786fd2221 extra encoding on mail titles 2015-08-20 01:12:35 -07:00
redmatrix
d140620008 add item validation function 2015-08-13 19:35:57 -07:00
redmatrix
c8b8c6cb14 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/items.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
2015-08-11 19:24:31 -07:00
redmatrix
58c9f516b3 private mail isues 2015-08-09 01:18:36 -07:00
redmatrix
8ce4814835 convert diaspora_signature to json for storage 2015-08-08 15:19:50 -07:00
redmatrix
2656aeaf9c ensure diaspora_signature is converted to json before we store it. 2015-08-08 15:18:34 -07:00
redmatrix
03a833f2f8 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
2015-08-05 16:13:42 -07:00
redmatrix
6413ba3230 connection filter fixes 2015-08-05 16:12:05 -07:00
redmatrix
5344431fc0 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-08-04 16:02:12 -07:00
redmatrix
a61fc00fa4 unobscure item before applying connection filter 2015-08-04 15:59:18 -07:00
redmatrix
f594a7776c Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/it/messages.po
	view/it/strings.php
2015-08-03 21:17:00 -07:00
redmatrix
6826b4ad32 these were some really difficult bugs to find 2015-08-03 21:13:17 -07:00
redmatrix
db70c76494 diaspora_meta getting double json encoded 2015-08-02 23:05:15 -07:00
redmatrix
d5a40cac25 Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
	include/items.php
2015-07-30 17:11:16 -07:00
redmatrix
df41ce9536 incorrect function name 2015-07-29 17:04:50 -07:00
redmatrix
845024e1e7 add connection filter to non-zot posts 2015-07-29 17:04:17 -07:00
redmatrix
3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	util/messages.po
2015-07-27 18:01:20 -07:00
redmatrix
0b232a610c logic issue in connection filter 2015-07-27 13:48:41 -07:00
redmatrix
cc5b0cde1d Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/diaspora.php
2015-07-23 21:07:35 -07:00
redmatrix
c0e67db070 refresh diaspora xchan every month or so since receiving profile update messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time. 2015-07-22 19:02:45 -07:00
zottel
5c52120fb4 make content filter by language work for excludes 2015-07-22 09:34:32 +02:00
redmatrix
c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/to_do_code.bb
2015-07-21 17:13:48 -07:00
redmatrix
d87c7ceeb0 there is no stricmp() in php, use strcasecmp() - also only detect language if we plan to use it. 2015-07-20 19:33:42 -07:00
redmatrix
6645846ad3 allow per-connection content filter to specify a detected language to include/exclude (in addition to text, tags, and regexes) 2015-07-20 02:04:51 -07:00
redmatrix
24ec104819 silence warning about non array diaspora_meta but report it in the logs so we can find out what it actually is and why. 2015-07-19 21:18:13 -07:00