volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-23	33	-238/+532
\|\
\| *	change name of module	redmatrix	2015-08-22	6	-11/+13
\| \|
\| *	increase width of tasklist input element	redmatrix	2015-08-22	1	-1/+5
\| \|
\| *	restrict event notification to events and birthdays (exclude tasks)	redmatrix	2015-08-22	1	-0/+2
\| \|
\| *	add load_pdl hook for plugins	redmatrix	2015-08-22	2	-1/+6
\| \|
\| *	add task widget	redmatrix	2015-08-21	1	-0/+5
\| \|
\| *	support ical priority	redmatrix	2015-08-20	1	-7/+19
\| \|
\| *	limit the height of tasklist	redmatrix	2015-08-20	1	-0/+8
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-20	5	-4/+16
\| \|\
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-20	2	-105/+105
\| \| \|\
\| \| * \|	missed this one - it's required	redmatrix	2015-08-20	5	-4/+16
\| \| \| \|
\| * \| \|	put tasklist into events page comanche layout	redmatrix	2015-08-20	1	-0/+3
\| \| \| \|
\| * \| \|	cleanup of task widget - make jquery workflow a bit smoother	redmatrix	2015-08-20	3	-34/+44
\| \| \| \|
\| * \| \|	more work on tasks	redmatrix	2015-08-20	5	-9/+71
\| \| \| \|
\| * \| \|	We don't need photos to also include attachments. It's interesting, but not ↵	redmatrix	2015-08-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	all that useful.
\| * \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-20	2	-105/+105
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Another Spanish strings update	jeroenpraat	2015-08-20	2	-105/+105
\| \| \|/
\| * \|	some event related fixes and some base work for implementing native tasks ↵	redmatrix	2015-08-20	3	-18/+100
\| \| \| \| \| \| \| \| \| \| \| \|	(to-do lists); which should already be importable and exportable.
\| * \|	do ical export before checking logged in channel	redmatrix	2015-08-20	2	-24/+22
\| \| \|
\| * \|	add carriage return to newlines for exported events (rfc2445:4.1)	redmatrix	2015-08-20	1	-31/+31
\| \| \|
\| * \|	extra encoding on mail titles	redmatrix	2015-08-20	2	-2/+2
\| \| \|
\| * \|	use consistent terminology	redmatrix	2015-08-19	1	-1/+1
\| \| \|
\| * \|	fix photo location	redmatrix	2015-08-19	2	-2/+13
\| \| \|
\| * \|	check perms on ical attachments	redmatrix	2015-08-19	1	-3/+6
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-19	2	-50/+72
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/api.php
\| \| *	add photo_detail api call	redmatrix	2015-08-18	1	-68/+89
\| \| \|
\| \| *	update to_do	redmatrix	2015-08-18	1	-0/+1
\| \| \|
\| * \|	event integration improvements	redmatrix	2015-08-19	4	-3/+55
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-19	45	-11403/+20389
\|\\| \|
\| * \|	import and export tasks (calendar todo items)	redmatrix	2015-08-18	1	-5/+203
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-18	6	-6/+20
\| \|\\|
\| \| *	add event_sequence for vtodo's	redmatrix	2015-08-18	5	-5/+19
\| \| \|
\| \| *	add month to export filename when using month	redmatrix	2015-08-17	1	-1/+1
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	1	-1/+1
\| \|\\|
\| \| *	off by one	redmatrix	2015-08-17	1	-1/+1
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	2	-5/+21
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php
\| \| *	provide ability to export by month as well as by year	redmatrix	2015-08-17	2	-4/+19
\| \| \|
\| * \|	issues encountered whilst testing import_items module using yearly dump files	redmatrix	2015-08-17	2	-3/+2
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	1	-0/+12
\| \|\\|
\| \| *	add item_id to yearly dump files	redmatrix	2015-08-17	1	-0/+12
\| \| \|
\| * \|	provide module for importing yearly content dumps	redmatrix	2015-08-17	3	-0/+199
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	6	-302/+302
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	3	-329/+329
\| \| \|\
\| \| \| *	Replaced Dutch po file by Spanish po file by accident. Had no visible impact.	jeroenpraat	2015-08-17	1	-2075/+2071
\| \| \| \|
\| \| \| *	Final Spanish strings for now	jeroenpraat	2015-08-17	2	-297/+297
\| \| \| \|
\| \| \| *	Fixed Spanish strings	jeroenpraat	2015-08-17	1	-2103/+2107
\| \| \| \|
\| \| * \|	commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵	redmatrix	2015-08-17	4	-5/+5
\| \| \|/ \| \| \| \| \| \| \| \| \|	checkboxes from bulk edit checkboxes in the css
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-16	3	-10/+15
\| \|\\|
\| \| *	issue #386 - account and channel bulk edit checkboxes not visible and ↵	redmatrix	2015-08-16	3	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \|	therefore not useable. Also change wording to remove the offensive 'user' designation.
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-16	5	-4/+37
\| \|\\|