13916 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	72b7b19937	update to_do	2015-08-18 20:00:11 -07:00
redmatrix	37d07a7d2a	add event_sequence for vtodo's	2015-08-18 17:10:40 -07:00
redmatrix	75fbf21e6b	add month to export filename when using month	2015-08-17 22:27:41 -07:00
redmatrix	9f4f967ead	off by one	2015-08-17 22:25:17 -07:00
redmatrix	f682325924	provide ability to export by month as well as by year	2015-08-17 22:20:10 -07:00
redmatrix	1982fc807f	add item_id to yearly dump files	2015-08-17 21:38:43 -07:00
redmatrix	4ebee195cc	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-17 16:12:35 -07:00
redmatrix	98eeff7538	commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css	2015-08-17 16:11:10 -07:00
jeroenpraat	f2fdc91ad5	Replaced Dutch po file by Spanish po file by accident. Had no visible impact.	2015-08-17 22:27:33 +02:00
jeroenpraat	d88c25c982	Final Spanish strings for now	2015-08-17 22:21:55 +02:00
jeroenpraat	f70fd95361	Fixed Spanish strings	2015-08-17 13:38:43 +02:00
redmatrix	631eb4b2c2	issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation.	2015-08-16 19:52:25 -07:00
redmatrix	b3b566c907	add DB support for tasks, todo items and repeating events	2015-08-16 17:17:34 -07:00
redmatrix	1d4dc7e27c	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-14 22:20:44 -07:00
redmatrix	0d84c77c6c	set email verified if lost password workflow is completed to avoid the situation where they can reset the password but still not be able to login because the original email verification was lost.	2015-08-14 22:19:15 -07:00
redmatrix	400eb748eb	Merge pull request #385 from solstag/commentperm ... Actually work out comment perms in zot.php (badly attempted at 36b5f6ac)	2015-08-15 10:08:26 +10:00
Alexandre Hannud Abdo	73b30de9cb	Properly fix which perms get checked for comments, Mike's solution	2015-08-14 12:21:05 -03:00
jeroenpraat	7a8d0a03f6	update spanish	2015-08-14 15:57:05 +02:00
redmatrix	98f3242e73	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-12 22:38:08 -07:00
redmatrix	0b7365e2db	revert 36b5f6ac	2015-08-12 22:37:24 -07:00
jeroenpraat	3099562a21	Some corrections of Spanish strings.	2015-08-12 20:52:46 +02:00
jeroenpraat	588d22974c	And Catalan!	2015-08-12 15:16:56 +02:00
jeroenpraat	4c2bbe3c41	Thanks to Manuel. Updated Spanish to 100 procent.	2015-08-12 15:11:04 +02:00
redmatrix	d882b3274b	doc fixes	2015-08-11 22:32:53 -07:00
redmatrix	1aa48ddfaa	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-11 22:32:33 -07:00
redmatrix	ad02d5589d	Merge pull request #383 from solstag/commentpermgood ... Require comment perms only for own posts, allow senders to deliver co…	2015-08-12 15:31:36 +10:00
redmatrix	f30d2b489a	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-10 16:17:06 -07:00
redmatrix	81c740178d	convert abook_flags from hubzilla during cloning	2015-08-10 16:16:26 -07:00
Alexandre Hannud Abdo	36b5f6acfe	Require comment perms only for own posts, allow senders to deliver comments using stream perms.	2015-08-10 18:20:18 -03:00
jeroenpraat	eae88b0815	Update Dutch strings	2015-08-09 15:56:02 +02:00
redmatrix	2656aeaf9c	ensure diaspora_signature is converted to json before we store it.	2015-08-08 15:18:34 -07:00
redmatrix	ec5d91d8cf	closing tags	2015-08-06 21:07:25 -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	a61fc00fa4	unobscure item before applying connection filter	2015-08-04 15:59:18 -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
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	ae15dde8fb	revision update	2015-08-02 16:45:57 -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	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	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