14328 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
jeroenpraat	eae88b0815	Update Dutch strings	2015-08-09 15:56:02 +02: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	bf3ea2cd47	update	2015-08-07 14:20:18 -07:00
redmatrix	bd03603f58	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-08-06 21:08:33 -07:00
redmatrix	ec5d91d8cf	closing tags	2015-08-06 21:07:25 -07:00
redmatrix	7e43da43a1	more file permissions inheritance work	2015-08-06 17:42:53 -07:00
redmatrix	91bbfcf554	photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.	2015-08-06 17:09:09 -07:00
redmatrix	1b0cb9388c	prohibit some photo album edit operations until we figure out how to sync them with dav	2015-08-05 22:35:42 -07:00
redmatrix	880dec5a4e	don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir)	2015-08-05 22:07:51 -07:00
redmatrix	dfb8a1b2d4	photo album is decided in dav or attach modules now - don't set it in photos_upload	2015-08-05 21:42:00 -07:00
redmatrix	cb8f0a0e0f	uploaded photo from dav (file put, not dav create) not showing in photo album	2015-08-05 20:54:32 -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	efa589300a	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-05 16:12:30 -07:00
redmatrix	6413ba3230	connection filter fixes	2015-08-05 16:12:05 -07:00
jeroenpraat	510cb5df86	Update Dutch strings	2015-08-05 22:31:40 +02:00
redmatrix	ea63f3312f	personal oembed black/white list	2015-08-04 20:07:55 -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	56045093cc	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-03 21:13:54 -07:00
redmatrix	6826b4ad32	these were some really difficult bugs to find	2015-08-03 21:13:17 -07:00
redmatrix	b737e224b1	more work separating Diaspora from core	2015-08-03 16:52:51 -07:00
Paolo T	2f5a39bc2f	Merge pull request #382 from tuscanhobbit/master ... Italian translation	2015-08-03 09:24:39 +02:00
Paolo Tacconi	5d2f35dc60	Italian translation	2015-08-03 09:21:01 +02:00
redmatrix	db70c76494	diaspora_meta getting double json encoded	2015-08-02 23:05:15 -07:00
redmatrix	9f5dfe797b	begin moving diaspora to plugin	2015-08-02 17:38:34 -07:00
redmatrix	49532aa6dd	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-08-02 16:47:36 -07:00
redmatrix	ae15dde8fb	revision update	2015-08-02 16:45:57 -07:00
redmatrix	c1a953f960	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: util/messages.po	2015-07-31 15:45:13 -07:00
redmatrix	5e985ef34f	consistency of event form	2015-07-31 15:42:52 -07:00
redmatrix	6f9771768d	event parse cleanup	2015-07-30 22:49:43 -07:00
redmatrix	acc9a8e43b	escape $ in events	2015-07-30 22:29:10 -07:00
redmatrix	1d218784d1	undefined function	2015-07-30 20:37:32 -07:00
redmatrix	f45cb8cf1f	minor - add all the newly supported table columns	2015-07-30 20:04:02 -07:00
redmatrix	4035c6f161	incorrect photo permissions when uploaded via /cloud; issue #21	2015-07-30 19:50:06 -07:00
redmatrix	fd947c205b	make /cloud work again after all the shuffling this morning	2015-07-30 18:34:30 -07:00
redmatrix	ec41899328	update some of the old attach.flag values to the new schema	2015-07-30 17:16:23 -07:00
redmatrix	26411ab385	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-30 17:12:23 -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	4c6368d075	dummy update	2015-07-30 17:07:03 -07:00
redmatrix	1097cd2583	minor cleanup	2015-07-29 19:01:25 -07:00
redmatrix	b1ceb33ae0	Merge branch 'vobject' ... Conflicts: include/event.php	2015-07-29 18:59:28 -07:00
redmatrix	00fa2e2fe8	convert ics import to sabre/vobject	2015-07-29 18:57:52 -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	e3f605e242	PRIVACY: imported events	2015-07-29 16:30:00 -07:00
redmatrix	4c83e9b6b4	initial work on using sabre as a vcalendar parser	2015-07-28 21:55:28 -07:00
redmatrix	03756c65fc	make superblock block a channel if it's an owner as well as the current author; add @hostname to event hashes to make their use in vcalendar more RFC compliant	2015-07-28 17:55:21 -07:00