1352 commits

Author	SHA1	Message	Date
Andrew Manning	3d6359f2e7	Removed defunct URL from old auto-update idea	2015-12-26 16:20:56 -05:00
redmatrix	a085f4df7f	regression: default inherited permission was not being set for a connection if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting.	2015-12-25 14:25:58 -08:00
redmatrix	36717e5f32	start on refactor of plugin/theme/widget info block parsing	2015-12-22 19:53:00 -08:00
redmatrix	f23e8f8d41	merge hell	2015-12-20 14:55:43 -08:00
Haakon Meland Eriksen	628e565a6c	Merge remote-tracking branch 'upstream/master'	2015-12-18 16:04:07 +01:00
Mario Vavti	f78e9001f3	fix search item attachment rendering	2015-12-17 19:39:26 +01:00
jeroenpraat	5a59cd9b8c	Invitation only added to the admin site page. Plus css wrapper class to docu search.	2015-12-15 21:00:40 +01:00
Haakon Meland Eriksen	3b1ab5e79c	Merge remote-tracking branch 'upstream/master'	2015-12-14 18:55:43 +01:00
Haakon Meland Eriksen	565126a888	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-12 10:00:15 +01:00
Haakon Meland Eriksen	e7d9863432	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-11 19:40:09 +01:00
Haakon Meland Eriksen	b9af0645c2	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-11 19:34:29 +01:00
Haakon Meland Eriksen	d86bc0b6cf	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-10 20:43:32 +01:00
Haakon Meland Eriksen	e01d4f289b	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-10 07:27:42 +01:00
Haakon Meland Eriksen	6a3995014e	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-09 07:38:58 +01:00
Haakon Meland Eriksen	534a537319	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-09 07:31:18 +01:00
Haakon Meland Eriksen	10eefc4eed	Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version	2015-12-09 07:28:55 +01:00
Haakon Meland Eriksen	3d4b3b6a92	Hubzilla textbox - promoting Hubzilla features in jot.tpl	2015-12-09 07:19:31 +01:00
redmatrix	29ac533cc9	remove some unused stuff	2015-12-08 16:32:06 -08:00
redmatrix	b9f5076cfc	move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time)	2015-12-07 19:17:40 -08:00
Mario Vavti	69c9f4588c	make justify gallery work with more than one albums per page (eg album widget)	2015-12-07 12:13:51 +01:00
Mario Vavti	78a70fed2f	fix css issue in directory	2015-12-06 16:37:57 +01:00
Mario Vavti	593423434c	fix attachment rendering for mail	2015-12-02 09:44:25 +01:00
Mario Vavti	7db86a4e05	css fixes	2015-11-28 14:47:17 +01:00
Mario Vavti	122d7281f7	fix tpl if clause	2015-11-28 11:04:33 +01:00
Mario Vavti	fce1dc083b	add templates	2015-11-27 22:53:36 +01:00
Mario Vavti	bcfa72ed31	move events tools to aside widget	2015-11-27 22:45:28 +01:00
Mario Vavti	e569f5d6eb	unset does not work in webkit browsers	2015-11-27 14:00:37 +01:00
Mario Vavti	ee153f64d4	add spinner to events	2015-11-27 13:32:20 +01:00
Mario Vavti	a73c385831	lost calendar icon	2015-11-26 23:29:49 +01:00
Mario Vavti	91b35c5349	various css fixes	2015-11-26 23:19:06 +01:00
Mario Vavti	056db37c66	beautify event item code	2015-11-26 22:14:20 +01:00
Mario Vavti	5cb71fa5da	default timepicker to 15 min steps. abbr -> span	2015-11-26 21:00:04 +01:00
Mario Vavti	8a269823d2	improve event rendering	2015-11-26 20:53:42 +01:00
Mario Vavti	c407e72dcc	add location	2015-11-26 16:40:40 +01:00
Mario Vavti	8e3b796a2f	fix event rendering	2015-11-26 16:38:14 +01:00
Mario Vavti	c7cbd41c16	first iteration on the event item	2015-11-26 12:26:27 +01:00
Mario Vavti	3ea84d7eab	some basic event styling	2015-11-25 22:55:07 +01:00
Mario Vavti	a80c45940e	add a if clause for the case we do not have a finish date	2015-11-25 19:02:48 +01:00
Mario Vavti	ab71e33d83	note to self: do not make things more complicated than they need to be.	2015-11-25 17:28:26 +01:00
Mario Vavti	fe57e7059b	events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted	2015-11-25 15:05:21 +01:00
Mario Vavti	1767a07f4d	efent form template fixes	2015-11-24 19:18:26 +01:00
Mario Vavti	f520cd92d0	open form on dbl-click	2015-11-24 14:33:23 +01:00
Mario Vavti	987619130b	some event heavy lifting - please test and report issues	2015-11-24 14:15:28 +01:00
redmatrix	34b804e9dc	Merge pull request #182 from anaqreon/url-selected ... Place link around selected text	2015-11-24 09:41:55 +11:00
redmatrix	a7e4553ea7	delivery report tweaks	2015-11-22 17:12:30 -08:00
Mario Vavti	d726c921eb	make calendar week start (sun or mon) configurable	2015-11-21 15:33:57 +01:00
Andrew Manning	fee8503093	Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected	2015-11-20 21:57:10 -05:00
Andrew Manning	6083cd2559	If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs.	2015-11-20 21:55:13 -05:00
Mario Vavti	a3e47d26f6	make calendar language aware	2015-11-20 16:39:55 +01:00
jeroenpraat	c7652fc29c	Had to switch these 2. Sorry.	2015-11-20 00:50:54 +01:00