15342 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	5ec5b127d0	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-26 11:38:07 -08:00
redmatrix	0cf9e498b9	version	2015-11-26 11:37:43 -08: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	17e7b276f6	we also need nofinish in the object. css fices	2015-11-26 14:45:22 +01:00
Mario Vavti	306ce3819e	css fixes	2015-11-26 14:16:35 +01:00
Mario Vavti	f80aff4a65	also catch the other object	2015-11-26 13:28:31 +01:00
Mario Vavti	c7cbd41c16	first iteration on the event item	2015-11-26 12:26:27 +01:00
redmatrix	41542e6886	document that you probably shouldn't set a primary directory server in somebody else's realm.	2015-11-25 17:34:03 -08:00
redmatrix	a039869ba0	issue #185	2015-11-25 17:30:11 -08:00
redmatrix	192e85ffa4	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-25 15:14:20 -08:00
redmatrix	b334201797	removed block style on dropdown contact name and details, added dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable	2015-11-25 15:12:54 -08: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
Wave	2de65ab39f	Merge pull request #3 from redmatrix/master ... Update branch	2015-11-25 09:39:44 +01:00
redmatrix	0559db9cf8	fix event form initial values	2015-11-24 15:37:33 -08:00
redmatrix	bae7b034e6	add (blank?) label param to other instances of datetimesel	2015-11-24 14:54:13 -08:00
Mario Vavti	74a40adece	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-11-24 19:18:52 +01:00
Mario Vavti	1767a07f4d	efent form template fixes	2015-11-24 19:18:26 +01:00
Wave	af7549d2f6	Merge pull request #187 from wave72/master ... Updated Italian strings	2015-11-24 17:02:58 +01:00
Paolo Tacconi	e785b723aa	Updated Italian strings	2015-11-24 16:50:12 +01:00
Mario Vavti	f520cd92d0	open form on dbl-click	2015-11-24 14:33:23 +01:00
Mario Vavti	eb6fd311df	fix event droping	2015-11-24 14:25:16 +01:00
Mario Vavti	5a12944b39	oups :)	2015-11-24 14:18:29 +01:00
Mario Vavti	987619130b	some event heavy lifting - please test and report issues	2015-11-24 14:15:28 +01:00
Haakon Meland Eriksen	2b2723cb74	Merge remote-tracking branch 'upstream/master'	2015-11-24 07:23:43 +01:00
redmatrix	e485ecb3b4	more database doco	2015-11-23 20:23:20 -08:00
redmatrix	8c5203f7e1	issue #185 - prevent liveUpdate from updating while the built-in html5 media player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time.	2015-11-23 17:47:18 -08:00
redmatrix	dfaf1a1075	issue #183	2015-11-23 15:27:57 -08:00
redmatrix	bf5c0e0b0d	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-23 15:18:19 -08:00
redmatrix	167e754a1b	issue #184	2015-11-23 15:17:38 -08:00
redmatrix	34b804e9dc	Merge pull request #182 from anaqreon/url-selected ... Place link around selected text	2015-11-24 09:41:55 +11:00
Haakon Meland Eriksen	7338649fa5	Merge remote-tracking branch 'upstream/master'	2015-11-23 14:16:14 +01:00
redmatrix	ae1103c5a3	doco updates	2015-11-22 18:20:19 -08:00
redmatrix	a7e4553ea7	delivery report tweaks	2015-11-22 17:12:30 -08:00
redmatrix	6f27e8db38	Merge https://github.com/redmatrix/hubzilla into pending_merge ... Conflicts: version.inc	2015-11-22 14:08:20 -08:00
redmatrix	292b02b58c	webpages and design elements weren't being included in the item export query.	2015-11-22 14:06:52 -08:00
Haakon Meland Eriksen	e60f527cb0	Documenting the need to change database server address from 127.0.0.1 to localhost when installing Hubzilla on OpenShift with the deploy script	2015-11-22 10:50:17 +01:00
Haakon Meland Eriksen	b5a5a91b13	Merge remote-tracking branch 'upstream/master'	2015-11-22 01:56:25 +01:00
Mario Vavti	4c84a2ce61	update datetimepicker and fix it for finish date	2015-11-22 00:13:33 +01:00
Mario Vavti	18e0e4b597	do not hide scrollbars	2015-11-21 23:51:50 +01:00
Mario Vavti	74b574d0b1	datetimepicker should also respect first day of week setting	2015-11-21 23:49:29 +01:00
Haakon Meland Eriksen	9ba1b8d720	Merge remote-tracking branch 'upstream/master'	2015-11-21 17:18:44 +01:00
Mario Vavti	d726c921eb	make calendar week start (sun or mon) configurable	2015-11-21 15:33:57 +01:00
Haakon Meland Eriksen	bd45bb3ad3	Merge remote-tracking branch 'upstream/master'	2015-11-21 12:17:38 +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
ken restivo	fabf7081d3	Use http_status() instead of homegrowing it. Adapt http_status to handle replies with data.	2015-11-20 18:56:41 -08: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