5523 Commits

Author	SHA1	Message	Date
redmatrix	0d8fcbe48d	discovered a couple of loose ends in the per-member enable diaspora setting	2015-06-22 15:03:47 -07:00
redmatrix	ae6612025d	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: include/items.php util/messages.po	2015-06-21 20:51:07 -07:00
redmatrix	68534fd5dc	some diaspora import issues uncovered during dry-run tests	2015-06-21 17:30:23 -07:00
redmatrix	e1caf77480	Merge pull request #352 from solstag/store_update_fix ... Make item_store_update only affect the data we requested	2015-06-21 10:07:58 +10:00
redmatrix	9dfb8a3401	ensure the photo driver is included	2015-06-20 16:24:10 -07:00
redmatrix	dd950baa82	import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction	2015-06-20 16:21:25 -07:00
Alexandre Hannud Abdo	ec23a94b6d	Make item_store_update only affect the data we requested	2015-06-20 02:21:25 -03:00
redmatrix	ddbaabd62d	wrong logic	2015-06-19 18:08:10 -07:00
redmatrix	94e7a425e6	import_diaspora - a few more atypical settings	2015-06-19 18:06:55 -07:00
redmatrix	e85d2c4b90	import_diaspora: add all the friends	2015-06-19 17:07:31 -07:00
redmatrix	0a9d3b4025	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-06-19 16:44:16 -07:00
redmatrix	6bd90816dd	very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.	2015-06-19 16:39:03 -07:00
Mario Vavti	de84f48e2f	bring some more generic-content-wrappers and fix some of them	2015-06-19 12:44:11 +02:00
redmatrix	33c9d8e06b	all file attachments are now stored natively, still have photos-0 to store natively	2015-06-18 22:12:26 -07:00
redmatrix	6aa159e2ac	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-18 19:15:01 -07:00
redmatrix	7e59580812	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-06-18 16:36:47 -07:00
redmatrix	1a9c059062	issues with markdownify and escaped HTML	2015-06-18 16:35:40 -07:00
redmatrix	2963be60e5	more photos work	2015-06-17 18:26:56 -07:00
redmatrix	6ab20eb1b5	lots of work on merging photo and file albums/folders	2015-06-17 17:44:31 -07:00
redmatrix	c6c17182e5	attach_mkdirp - implement force option to return success if dir exists	2015-06-17 01:18:55 -07:00
redmatrix	4ecee713d5	recursive mkdir (ala mkdir -p) for file and photo storage	2015-06-16 22:58:26 -07:00
redmatrix	39309ad45c	start work on photo directories	2015-06-16 19:05:09 -07:00
redmatrix	65661b7ec3	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: mod/photos.php mod/siteinfo.php	2015-06-16 18:43:03 -07:00
redmatrix	d84b3cfc3c	remove file/attachments when their associated photos are removed	2015-06-16 17:50:15 -07:00
Mario Vavti	40ee0d41dc	fix deleting of album for remote channel	2015-06-16 12:54:29 +02:00
redmatrix	bc72d3fd26	move profile photos to new methods	2015-06-15 23:37:51 -07:00
redmatrix	bdedda7c6b	fix attachment permissions when they also contain an image.	2015-06-15 20:43:49 -07:00
redmatrix	2adc7a51ad	photo upload: pass in the contact_allow and resource_id via include/attach.php	2015-06-15 19:52:17 -07:00
redmatrix	859a2ac8ef	DB changes for some channel flags	2015-06-15 17:28:52 -07:00
redmatrix	be0459a98b	convert the abook fields	2015-06-14 21:08:00 -07:00
redmatrix	f0b255b1a9	more file/photo merge work	2015-06-14 17:28:51 -07:00
redmatrix	9642728e7d	first cut at merging files and photos, not yet well integrated but they are integrated	2015-06-14 16:50:24 -07:00
redmatrix	b7be79c5e7	isolate the os_storage flag	2015-06-13 15:57:28 -07:00
redmatrix	3f0009ccd7	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: util/messages.po	2015-06-13 15:02:51 -07:00
redmatrix	e838647e3a	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-11 22:48:01 -07:00
redmatrix	6562820175	make cloud work again	2015-06-11 22:47:45 -07:00
redmatrix	485b19958e	don't provide a connect button on the sys channel profile sidebar	2015-06-11 22:46:37 -07:00
redmatrix	41085ae03f	start on the DAV/photos merger	2015-06-11 22:32:08 -07:00
redmatrix	5733491ac8	more work on items ... and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php	2015-06-11 17:56:56 -07:00
redmatrix	8812f183a2	the hubzilla version of this function	2015-06-11 16:11:59 -07:00
redmatrix	dc7de12991	hubzilla compatibility function	2015-06-11 15:52:37 -07:00
redmatrix	b2c5020af7	diaspora disallowed by default	2015-06-10 18:51:39 -07:00
redmatrix	ca870dbf31	more work on item table optimisation	2015-06-10 16:59:04 -07:00
redmatrix	2128d5a256	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-10 15:47:23 -07:00
redmatrix	29d9d38d7f	retire old Friendica RINO encryption functions	2015-06-09 22:24:24 -07:00
redmatrix	eb6a1f8387	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-09 19:39:21 -07:00
redmatrix	d08c43d80c	toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.	2015-06-09 18:50:11 -07:00
redmatrix	03357481f7	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php	2015-06-09 16:52:00 -07:00
redmatrix	39f0e6fe62	add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public".	2015-06-08 16:55:17 -07:00
redmatrix	7cbc504874	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-02 17:47:47 -07:00