4413 Commits

Author	SHA1	Message	Date
redmatrix	68534fd5dc	some diaspora import issues uncovered during dry-run tests	2015-06-21 17:30:23 -07:00
redmatrix	a6b9d1595e	automatically gunzip Diaspora export files if we're on a *nix system	2015-06-19 17:18:01 -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
redmatrix	6aa159e2ac	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-18 19:15:01 -07:00
redmatrix	25e134dd9c	set return url from apps page	2015-06-18 17:53:26 -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	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	ec54111e6b	Merge pull request #349 from git-marijus/master ... make photo upload work for remote channels with perms	2015-06-17 11:14:18 +10:00
redmatrix	d84b3cfc3c	remove file/attachments when their associated photos are removed	2015-06-16 17:50:15 -07:00
jeroenpraat	24befa2197	Small fix in siteinfo	2015-06-16 13:24:10 +02:00
Mario Vavti	93f48cd8bb	make photo upload work for remote channels with perms	2015-06-16 12:18:50 +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	8c7472c6c3	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: view/nl/messages.po view/nl/strings.php	2015-06-15 17:30:08 -07:00
redmatrix	859a2ac8ef	DB changes for some channel flags	2015-06-15 17:28:52 -07:00
Mario Vavti	905cd1da5b	do not allow/show acl button on photo edit if not owner	2015-06-15 13:04:16 +02:00
redmatrix	d2178e43f6	sql errors after last major edit adventure	2015-06-14 21:19:13 -07:00
redmatrix	be0459a98b	convert the abook fields	2015-06-14 21:08:00 -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	23f7f60bf7	make new os_storage flag work	2015-06-14 15:59:11 -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	b2c5020af7	diaspora disallowed by default	2015-06-10 18:51:39 -07:00
redmatrix	bc1b7afc85	start to partition the dav	2015-06-10 18:11:15 -07:00
redmatrix	a14d2de1f0	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-10 17:58:02 -07:00
redmatrix	04551ac32b	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-06-10 17:45:04 -07:00
redmatrix	9a5d9fb8c5	put block_public back where it is needed, which is in mod_public and not mod_home	2015-06-10 17:44:04 -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
Alexandre Hannud Abdo	a31fdd3fbb	correctly fix attachment permissions from private mentions ... by postponing code that removes the attachment tag from the body	2015-06-10 15:37:10 -03:00
Mario Vavti	edd2d1e8d4	show login without checking for block_public, local or remote channel	2015-06-10 13:24:16 +02:00
Mario Vavti	20a317b5b7	really show login form if it is enabled	2015-06-10 11:58:45 +02:00
redmatrix	eb6a1f8387	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-09 19:39:21 -07:00
redmatrix	9592f7f3e6	put mirror_frontpage setting into admin/site	2015-06-09 19:37:12 -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	faa7f97c25	s/broder/border/	2015-06-09 16:52:53 -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	805e2a28ee	add nomadic identities as webfinger aliases	2015-06-09 16:29:51 -07:00
redmatrix	54b61f817d	provide a mechanism for loading the frontpage without redirecting.	2015-06-08 21:19:05 -07:00
redmatrix	507e10fa45	remove debugging	2015-06-08 16:57:30 -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	5b482c1daf	magic auth issues on dreamhost	2015-06-07 23:04:46 -07:00
redmatrix	9823541c4b	make sure these are included	2015-06-07 21:36:50 -07:00
redmatrix	3c5a5a9ebf	more frontpage tweaks	2015-06-07 18:59:14 -07:00
redmatrix	60cfea5d1f	reverse logic of homepage login setting	2015-06-07 18:27:05 -07:00
redmatrix	0537ff1e4a	frontpage tweaks	2015-06-07 18:15:26 -07:00
redmatrix	65bea5e02c	frontpage changes	2015-06-07 16:19:59 -07:00
redmatrix	ec1dcb8f2e	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: util/messages.po	2015-06-06 17:31:22 -07:00
jeroenpraat	93237f8d0a	Added translatable strings to the Display Settings page and refreshed util/messages.po.	2015-06-06 19:49:30 +02:00