Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-23 13:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
15641 commits 7 branches 31 tags 160 MiB
Commit graph

5408 commits

Author SHA1 Message Date
Mario Vavti
d0b0d0ec72 possibly improve cloned profile images a bit - mod/photo would pick some random photos if there are more than one kind of PHOTO_PROFILE 2015-10-30 15:08:28 +01:00
redmatrix
e0463f5a74 Merge pull request #107 from kenrestivo/fix-audio-preload 
Save bandwidth on mobile networks.
 2015-10-30 15:25:18 +11:00
ken restivo
1b30210120 Save bandwidth on mobile networks. 2015-10-29 20:50:52 -07:00
Mario Vavti
ec28dee728 update to latest object 2015-10-29 12:58:32 +01:00
Mario Vavti
3e459ed434 move it up 2015-10-29 11:34:56 +01:00
Mario Vavti
d66be62516 move it up 2015-10-29 11:34:30 +01:00
Mario Vavti
98fd919647 possibly better fix for profile photo image type issue 2015-10-29 11:30:45 +01:00
Mario Vavti
0a9b2b6b15 possibly better fox for profil photo image type issue 2015-10-29 11:29:11 +01:00
redmatrix
b5dfc54be3 fix the typo 2015-10-28 19:45:02 -07:00
redmatrix
848e3f6c5d photos linked item visibility issue 2015-10-28 19:43:35 -07:00
redmatrix
1f5818cec8 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-28 16:59:23 -07:00
redmatrix
06ec5424c7 restrict sslify to img tags by default - set config system.sslify_everything if you want to proxy media files also. 2015-10-28 16:58:13 -07:00
Mario Vavti
e0a75f68d5 re-enable pathinfo() check and try with getimagesize() if we have not got a result 2015-10-28 21:52:56 +01:00
Mario Vavti
a5f1fa3168 re-enable pathinfo() check and try with getimagesize() if we have not got a result 2015-10-28 21:52:15 +01:00
Mario Vavti
1375ed6aea pathinfo() does not work in this case. getimagesize() seems more reliabel. this fixes transparent png avatars having a black background. 2015-10-28 20:01:50 +01:00
Mario Vavti
f1a3b281d4 pathinfo() does not work in this case. getimagesize() seems more reliabel. this fixes transparent png avatars having a black background. 2015-10-28 19:59:50 +01:00
Mario Vavti
59da3dfe03 do not treat profile photo change posts like photo-items 2015-10-28 15:03:34 +01:00
redmatrix
612efe56f1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-27 21:18:03 -07:00
redmatrix
07c0bc7b04 api posting with htmlstatus fails if it doesn't contain any html tags issue #104 2015-10-27 21:16:59 -07:00
ken restivo
b3528c314a Support files with names like foo.0.1.3.ogg 2015-10-27 19:48:14 -07:00
ken restivo
869735e4b5 Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensions 2015-10-27 15:35:39 -07:00
Mario Vavti
3f1dc22c0e fix sharing of photo items 2015-10-27 11:07:40 +01:00
redmatrix
917d0ced4a new feature: delayed posting 2015-10-25 16:54:18 -07:00
redmatrix
7f3df847a2 make use of http_host vs. server_name configurable in script_path() 2015-10-25 15:37:09 -07:00
Stefan Krauth
2030aea175 Better handling for SSL reverse proxy 2015-10-25 20:10:35 +01:00
Mario Vavti
4442da306a hubzilla compatibility: improve photo item object - we now provide the infos for all available photo sizes 2015-10-25 18:02:45 +01:00
Mario Vavti
911fd6c654 improve photo item object - we now provide the infos for all available photo sizes 2015-10-25 18:01:44 +01:00
Mario Vavti
123fe58c26 new line between photo and description 2015-10-24 22:16:08 +02:00
Mario Vavti
ab8b4d5c36 another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload 2015-10-24 21:44:25 +02:00
Mario Vavti
5395b173aa implement the new anchor target behaviour 2015-10-22 12:09:19 +02:00
Mario Vavti
735f9c7a45 define $photo 2015-10-22 11:37:34 +02:00
Mario Vavti
9cbca24f7a photo object compatibility revamped 2015-10-22 10:56:24 +02:00
Mario Vavti
6f8d29ad80 move photo object stuff from itemObject to prepare_body() so we can do more stuff with it 2015-10-22 10:52:10 +02:00
redmatrix
eb947acebe set link target window for many links that are included in posts, but not in rest of application 2015-10-21 18:34:09 -07:00
redmatrix
01e84edd0a Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-21 15:02:32 -07:00
redmatrix
b7538b6ada turn relative links in app_render() into absolute links, without affecting the install. 2015-10-21 15:00:41 -07:00
Mario Vavti
232742a5e6 warn if quota exceeds 90% of storage limit 2015-10-21 12:52:03 +02:00
Mario Vavti
a33ddf373b move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation 2015-10-21 12:40:09 +02:00
Mario Vavti
beae28f2db add obj_type and object again 2015-10-20 13:19:05 +02:00
Mario Vavti
81b2c5ac68 fix jot photo upload 2015-10-20 13:03:28 +02:00
Mario Vavti
35b5f60f99 update large photo feature setting description 2015-10-20 09:58:48 +02:00
Mario Vavti
96f23758b4 hubzilla photo object compatibility 2015-10-20 09:40:32 +02: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
08a5884c9f revert - we can't guarantee what project name the fallback directory server has and this could cause bugs later 2015-10-19 17:03:34 -07:00
redmatrix
0f3b7dd6e9 update site on initial directory setup 2015-10-19 17:01:59 -07:00
redmatrix
bab73edcef extened the earlier fix 2015-10-19 16:50:53 -07:00
redmatrix
8aadc2837c typo 2015-10-19 16:19:00 -07:00
redmatrix
ea37882b95 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php
 2015-10-19 16:18:04 -07:00
redmatrix
57e0bfc5a9 add the project name to site info packet 2015-10-19 16:07:14 -07:00
Mario Vavti
4b300f8274 fix typo in include/notifier.php 2015-10-19 14:53:13 +02:00
redmatrix
f0a33c00bc separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected. 2015-10-18 20:13:12 -07:00
redmatrix
9b3662e5ad issues with "the Register" feed 2015-10-18 16:29:09 -07:00
redmatrix
76d41fc250 re-organise the protocol disabled logic 2015-10-18 15:49:52 -07:00
redmatrix
4b984f9819 filter delivery reports 2015-10-17 13:26:55 -07:00
redmatrix
e8882a5167 remove one more Friendica table reference from the API 2015-10-16 15:24:48 -07:00
Mario Vavti
b7408fa39e we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size 2015-10-16 16:27:51 +02:00
redmatrix
c07f694a07 another try at issue #89 - rotating photos 2015-10-16 04:21:40 -07:00
redmatrix
550cab41fb missing xchan_mail_query 2015-10-15 21:39:33 -07:00
redmatrix
45bd81fe8c missed the xchan_mail_query 2015-10-15 21:38:16 -07:00
redmatrix
3f7ee613fc mail sync debugging 2015-10-15 20:40:24 -07: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
redmatrix
7517c76ae4 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	install/update.php
 2015-10-15 16:02:37 -07:00
redmatrix
bf5a1f662a generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes. 2015-10-15 14:18:40 -07:00
Mario Vavti
391b98f72c fix webpages 2015-10-15 20:57:05 +02:00
Mario Vavti
d40a087ec2 really fix label name 2015-10-15 16:07:13 +02:00
Mario Vavti
138c14d43f wrong logic 2015-10-15 15:48:13 +02:00
Mario Vavti
dc6a594277 fix label name 2015-10-15 15:41:08 +02:00
Mario Vavti
73082a338b (re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now 2015-10-15 12:56:22 +02:00
Mario Vavti
2413968021 double up default photo sizes - even the mos simple camera can now do images > 1024px 2015-10-15 11:20:56 +02:00
Mario Vavti
44b542814a if photo deleted from /cloud or /dav also delete from /photos 2015-10-15 10:29:39 +02:00
Mario Vavti
2848f5dab4 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-15 09:36:51 +02:00
redmatrix
0563ce93a1 change name of matrix app 2015-10-14 18:03:05 -07:00
redmatrix
c8e3ea955d more mail sync work 2015-10-14 17:49:35 -07:00
redmatrix
b33a9a71f6 more work on import & sync of private mail and conversations 2015-10-14 17:40:50 -07:00
redmatrix
8af3dc140e issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud 2015-10-14 15:08:07 -07:00
redmatrix
de697a4267 issue #86 - like/dislike in photos not working 2015-10-14 14:16:16 -07:00
Mario Vavti
ca35db76b8 wrong variable 2015-10-14 23:07:49 +02:00
Mario Vavti
b6eded1119 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-14 22:57:03 +02:00
Mario Vavti
c8d8ae89d7 remove $item from $prep_arr - we probably do not need it 2015-10-14 22:46:40 +02:00
redmatrix
b2d949ce9a issue #82 - args not defined (should be arr) 2015-10-14 13:25:58 -07:00
Mario Vavti
f12ebffa39 really check for large photos feature 2015-10-14 22:24:13 +02:00
redmatrix
9b4d32b68c Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-14 13:19:52 -07: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
redmatrix
d616099de6 Merge pull request #80 from git-marijus/master 
fix /channel not updating after posting comment
 2015-10-14 18:19:32 +11:00
redmatrix
edeba4ca34 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/api.php
 2015-10-13 16:19:25 -07:00
redmatrix
7e03f612b3 file migration - continued 2015-10-13 16:16:51 -07:00
redmatrix
578f1b8ece api extenesions for file migration 2015-10-13 16:15:34 -07:00
Mario Vavti
e2a15d0ec9 fix photo visibility switch on photo upload 2015-10-13 14:05:27 +02:00
redmatrix
136e5fdf95 port of file detail api call 2015-10-12 23:39:55 -07:00
redmatrix
75fe9f9cc4 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-12 23:37:35 -07:00
redmatrix
73dad85867 file detail api call (will not work for huge files) 2015-10-12 23:36:26 -07:00
redmatrix
91895c52ca missing underscore 2015-10-12 19:54:01 -07:00
redmatrix
fc28af8518 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/attach.php
 2015-10-12 19:52:21 -07:00
redmatrix
3545626950 attach_list_files had some problems - wasn't used until now apparently 2015-10-12 19:49:06 -07:00
redmatrix
6a7079a594 small change to allow a person with sufficient privileges the ability to import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process. 2015-10-12 18:55:02 -07:00
redmatrix
c76da2e77d functions to update urls in items when doing migrations 2015-10-06 20:30:49 -07:00
Mario Vavti
26b97722c6 remove check mail - it just reloads the page. we get a notification in the panel if we get new mail 2015-10-04 13:43:16 +02:00
jeroenpraat
ab59e41e1a Red:Notify > Hubzilla:Notify 2015-10-03 15:51:12 +02:00
redmatrix
6171d164d7 need full path to deliver_hooks.php 2015-10-02 04:51:57 -07:00
redmatrix
982ff8733f one more change 2015-10-01 19:54:28 -07:00
redmatrix
ebe374d572 notification changes to support testdrive 2015-10-01 19:49:06 -07:00
redmatrix
dd45e7b4eb Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-01 17:30:15 -07:00
redmatrix
63eb0e3a38 allow additional uses for xtags 2015-10-01 17:28:03 -07:00
redmatrix
986244eeea issue #63 - missing table fields in db query 2015-09-30 21:38:21 -07:00
redmatrix
9bdb7bef5d add delivery reports to mail (not backported to redmatrix) 2015-09-30 19:27:53 -07:00
redmatrix
54e7d5d260 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	view/de/messages.po
	view/de/strings.php
 2015-09-30 16:31:06 -07:00
redmatrix
5265c190d4 document the issue with cloned delivery to self vs normal delivery to self 2015-09-30 16:27:24 -07:00
redmatrix
4b7c052ed8 undo self deliver check 2015-09-30 12:59:13 -07:00
redmatrix
fd290882fd undo self-deliver check 2015-09-30 12:57:02 -07:00
redmatrix
e769fbaffb another error from the db logs 2015-09-29 22:56:29 -07:00
redmatrix
5721f9f3a9 wrong table column names 2015-09-29 22:51:06 -07:00
redmatrix
cca9f2392e queue cleanup, and report issues 2015-09-29 22:11:10 -07:00
redmatrix
928fa44154 more work on the notifier 2015-09-29 21:08:12 -07:00
redmatrix
a795f03c48 improve the sys channel location repair to check key issues and re-installs and/or site moves 2015-09-29 17:21:14 -07:00
redmatrix
8f7b869c08 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-29 16:56:50 -07:00
redmatrix
c5294f994e check and repair sys channel locations (hublocs) in zot-finger if they are messed up 2015-09-29 16:55:51 -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
8d5556764c add one more level of parentheses to ensure operator precedence is correctly evaluated 2015-09-28 20:03:11 -07:00
redmatrix
f965209eee check public scopes against visitor in item_permissions_sql() 2015-09-28 19:45:57 -07:00
redmatrix
5c526995d8 resolve conflicts 2015-09-28 19:07:31 -07:00
redmatrix
50ee82e8bd Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-28 19:06:10 -07:00
redmatrix
8a3c909c74 ignore self delivery in process_delivery 2015-09-28 19:05:45 -07:00
redmatrix
3a8e1e0484 process_delivery: ignore self 2015-09-28 19:04:36 -07:00
redmatrix
3b53cd56ef Merge branch 'deadsite' 2015-09-28 17:15:34 -07:00
redmatrix
30e88a4f6b typo 2015-09-28 17:15:04 -07:00
redmatrix
e5f47cd14b create site records for all queued sites and check for death 2015-09-28 17:13:11 -07:00
Mario Vavti
b97102da01 private mail: bring additional inbox/outbox views and ajaxify single message drop 2015-09-28 17:40:38 +02:00
redmatrix
dbeae16dc1 add site_type to queries, first few - several more to go. 2015-09-28 04:21:29 -07:00
redmatrix
ed876a9c52 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-27 18:03:40 -07:00
redmatrix
67fe8fc4a7 well there's one problem... 2015-09-27 18:00:37 -07:00
redmatrix
55b530f0fd Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	util/messages.po
 2015-09-27 17:00:41 -07:00
redmatrix
aae51a9b23 add some safety checks on the sending side of sync 2015-09-27 16:47:25 -07:00
redmatrix
cd2b811555 move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts. 2015-09-26 23:44:30 -07:00
redmatrix
9ab335626c import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page. 2015-09-26 13:25:34 -07:00
redmatrix
8aec437c23 remove redundant code 2015-09-24 23:02:41 -07:00
redmatrix
98f656cfcb delivery optimisations 2015-09-24 22:51:47 -07:00
redmatrix
2c665e5e4c add Diaspora (actually any external service which uses the queue) to delivery reports 2015-09-24 17:41:05 -07:00
redmatrix
2fe3d16bbe Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-24 16:58:32 -07:00
redmatrix
2844f276b9 Document the additional content export options 2015-09-24 16:57:17 -07:00
Mario Vavti
b9723aa85b some heavy private mail restructuring - work in progress 2015-09-24 14:07:44 +02:00
redmatrix
b553ffd55d timezone tweaks 2015-09-23 20:59:19 -07:00
redmatrix
e45958b967 add plugin hooks to channel sync/import/export 2015-09-23 18:27:04 -07:00
redmatrix
7734bbfe4d problems with extended item import and signatures 2015-09-22 22:30:09 -07:00
redmatrix
d35c5bcb2f merge issue 2015-09-22 19:16:13 -07:00
redmatrix
c699d3a17a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-22 19:14:21 -07:00
redmatrix
d16ac62a51 don't send sync packets to deleted hubloc locations 2015-09-22 19:13:10 -07:00
redmatrix
15feeb7bfe inverted logic syncing deleted hublocs 2015-09-22 18:40:03 -07:00
redmatrix
02ecc93998 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-22 16:50:55 -07:00
redmatrix
34291d5938 add names to delivery report for sync delivery 2015-09-22 16:50:08 -07:00
redmatrix
e726adc27b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-22 16:45:14 -07:00
redmatrix
642f460dca report the channel sync 2015-09-22 16:43:36 -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
7dd61c05dc allow self delivery until we figure out why clone sync of posted items isn't doing it's thing 2015-09-22 04:39:36 -07:00
redmatrix
1c1155513a add one more test 2015-09-22 04:28:05 -07:00
redmatrix
f84151e1fe fix foreach warning 2015-09-22 04:24:54 -07:00
redmatrix
2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries 2015-09-22 04:04:51 -07:00
redmatrix
0b1b11ea53 heavy lifting for delivery reports 2015-09-22 02:32:04 -07:00
redmatrix
146ff6f703 more progress on delivery reports. Store the remote results from zot sites locally. 2015-09-21 22:30:28 -07:00
redmatrix
9baaa6fa56 issue #51 2015-09-21 20:05:54 -07:00
redmatrix
d2565d0f61 looks like chat has been neglected a bit recently 2015-09-20 21:37:18 -07:00
redmatrix
4fde0bf62e Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-20 20:58:55 -07:00
redmatrix
a679081993 new delivery report format 2015-09-20 20:21:54 -07:00
redmatrix
177292de13 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-20 18:10:25 -07:00
redmatrix
efcb4abfd0 improve on the last attempt 2015-09-20 18:08:06 -07:00
redmatrix
1501d1c570 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-20 18:03:41 -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
b240c15014 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-20 16:55:24 -07:00
redmatrix
9de8df496a we need the xchan record also 2015-09-20 16:52:21 -07:00
redmatrix
996cd7e2ab Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-20 00:28:22 -07:00
redmatrix
77df590f65 initial checkin delivery report class 2015-09-20 00:27:25 -07:00
redmatrix
ce064188c6 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-19 22:48:22 -07:00
redmatrix
5d6f59a598 clone new connections 2015-09-19 22:46:59 -07:00
redmatrix
f4a4cf1402 clone new connection requests 2015-09-19 15:36:07 -07:00
redmatrix
63146821d7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-18 23:02:49 -07:00
redmatrix
9ed8eac8c6 include site identitfier on redmatrix delivery reports also 2015-09-18 23:02:03 -07:00
redmatrix
43251ed8ce add reporting site to delivery report 2015-09-18 22:00:33 -07:00
redmatrix
fdd4c1b9d1 more work on surviving hub re-installs 2015-09-18 14:31:29 -07:00
redmatrix
f2fefb91d5 change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos. 2015-09-18 01:53:04 -07:00
redmatrix
cc95c3e9c8 start hooking in the new webfinger/zot merged discovery 2015-09-17 18:36:19 -07:00
redmatrix
f0a7a6a1e2 consolidate zotfinger and webfinger 2015-09-17 17:51:31 -07:00
redmatrix
c34d8286a3 change matrix to grid, begin webfinger optimisation 2015-09-16 21:27:58 -07:00
redmatrix
fae43010c5 nit 2015-09-14 21:35:41 -07:00
redmatrix
021c81cb62 don't deliver to dead hubs 2015-09-14 20:43:39 -07:00
redmatrix
97b990c9bf site checking stuff 2015-09-14 19:16:25 -07:00
redmatrix
8fb4f37670 remove xchan_instance_url - it needs to be an abook field, not an xchan field 2015-09-14 16:05:58 -07:00
redmatrix
fd708b28b8 ping site function (taken from admin/hubloc) 2015-09-13 22:48:18 -07:00
redmatrix
df0fa9883c check for empty word after trim 2015-09-12 14:37:55 -07:00
redmatrix
692e117c8a Merge pull request #38 from MicMee/master 
ensure that living sites are marked as alive
 2015-09-12 08:25:27 +10:00
redmatrix
d96ca61f2b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-11 14:57:26 -07:00
redmatrix
fc58b8cc0d log the remote message if there was one 2015-09-11 14:56:31 -07:00
redmatrix
45e1f93e56 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-11 14:33:07 -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
Michael Meer
755edd2110 ensure that living sites are marked as alive 2015-09-11 14:06:37 +02:00
redmatrix
4abfd4053a sync likes 2015-09-10 19:18:12 -07:00
redmatrix
00b480527a provide remote delivery report at logger_debug level 2015-09-10 17:53:06 -07:00
redmatrix
922d2165b3 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-10 16:51:22 -07:00
redmatrix
50e32c3d8a zot_refresh: always try the hubloc pointed to by xchan_addr first 2015-09-10 16:48:08 -07:00
redmatrix
2d94a038a5 ensure connections have a name 2015-09-10 01:21:18 -07:00
redmatrix
db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. 2015-09-09 19:54:16 -07:00
redmatrix
43e064749c major changes to "forum mode" on the network/matrix page 2015-09-09 18:50:15 -07:00
redmatrix
4af339da63 slight hack to improve public forum detection in the forum widget 2015-09-09 18:18:27 -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
d702133ded move mod_admin to Comanche finally 2015-09-08 20:48:35 -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
f0847e6f32 debugging menu sync 2015-09-08 18:40:56 -07:00
redmatrix
50d7554ccd add sync packets for menus 2015-09-08 18:40:19 -07:00
redmatrix
b28d3015fe Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-09-08 17:53:43 -07:00
redmatrix
75d521d42a menu import and sync 2015-09-08 17:52:39 -07:00
redmatrix
1ebaacfd5e menu export 2015-09-08 17:50:24 -07:00
redmatrix
c6bdf7e891 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 22:55:42 -07:00
redmatrix
11e19a06b7 export events 2015-09-07 22:54:43 -07:00
redmatrix
650e98b2a9 work on event sync 2015-09-07 21:01:49 -07:00
redmatrix
508969a183 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 20:29:13 -07:00
redmatrix
c39e3613a8 create event sync packets 2015-09-07 20:28:02 -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
redmatrix
6d1b64065a consolidate import_items/sync_items 2015-09-07 18:14:30 -07:00
Habeas Codice
6711ceb662 fix postgres zotfeed 2015-09-07 16:28:42 -07:00
redmatrix
2f52b6c164 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-07 04:06:27 -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
redmatrix
55ab968edf make js_upload work with hubzilla. It still needs a rewrite. 2015-09-05 17:35:00 -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
d79e81a069 import and sync chatrooms 2015-09-03 18:44:40 -07:00
redmatrix
f7d9523c7d export chatrooms 2015-09-03 18:43:44 -07:00
redmatrix
d93e1c84ac Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-09-03 17:28:51 -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
f3cb17ac3b app sync 2015-09-02 23:09:51 -07:00
redmatrix
669e111118 add timestamps for syncing apps 2015-09-02 21:07:24 -07:00
redmatrix
837b9224cc Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	doc/credits.bb
	mod/thing.php
 2015-09-02 20:33:58 -07:00
redmatrix
c22da3da1c start to modularise the clone import and sync functions 2015-09-02 20:12:40 -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
redmatrix
69fc10d5ad Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-02 15:49:50 -07:00
zottel
441946b9d3 really fix post filtering 2015-09-02 15:49:07 +02:00
redmatrix
9328edfdcd obscure mail subject in conversation structure 2015-09-01 22:59:06 -07:00
redmatrix
23213a91ed Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 22:27:00 -07:00
redmatrix
184c544a24 export apps 2015-09-01 22:26:21 -07: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
c5578d7964 match the redmatrix output format for objects (which is the hubzilla table format) 2015-09-01 21:08:02 -07:00
redmatrix
95cf1aafa0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 21:04:57 -07:00
redmatrix
f72a3113f5 add the baseurl so we can easily relocate objects 2015-09-01 21:03:55 -07:00
redmatrix
3c29b46c42 use different obj export output format for hubzilla compatibility 2015-09-01 20:57:53 -07:00
redmatrix
515f3bf111 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
	install/update.php
 2015-09-01 17:08:59 -07:00
redmatrix
3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00