2101 commits

Author	SHA1	Message	Date
zotlabs	20f7479b83	roll minor release number	2018-10-21 18:07:19 -07:00
zotlabs	b5063ab2a7	Merge branch 'dev'	2018-10-21 18:06:24 -07:00
zotlabs	6378cb8f27	miscellaneous fixes, unset project icon, onepoll feed failure	2018-10-20 02:03:31 -07:00
zotlabs	824338e116	rev update	2018-10-18 15:19:53 -07:00
zotlabs	ff57f8f7bc	Merge branch 'dev'	2018-10-17 01:48:07 -07:00
zotlabs	b40115111d	rev update	2018-10-16 20:59:54 -07:00
zotlabs	0795f19365	revision update	2018-10-16 20:58:22 -07:00
zotlabs	0b0d5e7eba	Merge branch 'dev'	2018-10-11 21:42:16 -07:00
zotlabs	4ac89e0dd2	version	2018-10-04 22:04:45 -07:00
zotlabs	4c758c73aa	define platform_name after reading htconfig	2018-10-03 19:23:59 -07:00
zotlabs	bd5d6158a1	zap/osada repo merger	2018-10-03 19:10:52 -07:00
zotlabs	290b8b58ec	rename groups and group_members tables	2018-09-25 17:50:59 -07:00
zotlabs	6f6d54d378	cleanup	2018-09-25 17:50:12 -07:00
zotlabs	cd8150f20d	push version	2018-09-23 18:23:28 -07:00
zotlabs	551314201c	Merge branch 'zap' into dev	2018-09-19 20:48:14 -07:00
zotlabs	d6f3867c06	ACTIVITY_CREATE defined twice	2018-09-19 20:45:42 -07:00
Mike Macgirvin	8b18c99058	reset version	2018-09-20 12:35:16 +10:00
zotlabs	cfbb7960c7	revert change to std_version after merging from master	2018-09-14 14:48:29 -07:00
zotlabs	96b713eb26	version	2018-09-12 22:33:17 -07:00
zotlabs	3bf479ac68	version	2018-09-12 22:21:43 -07:00
zotlabs	44df4d785e	Merge branch 'zap' into dev	2018-09-09 23:23:42 -07:00
zotlabs	b837f0b8fc	Merge branch 'red' into dev	2018-09-09 20:59:13 -07:00
zotlabs	be3b630474	important hyperdrive component	2018-09-09 20:53:20 -07:00
zotlabs	3ff96239f6	typo	2018-09-06 17:00:42 -07:00
zotlabs	7b492d2bd3	federated emoji support	2018-09-06 16:40:13 -07:00
zotlabs	44ca674937	Merge branch 'red' into dev	2018-09-05 21:18:14 -07:00
zotlabs	c2c9e45f1c	rev update	2018-09-05 16:58:27 -07:00
zotlabs	a33638281e	version	2018-09-05 16:55:47 -07:00
zotlabs	696d5fc350	version	2018-09-05 16:48:59 -07:00
zotlabs	b90495f95d	RC candidate	2018-09-05 16:37:06 -07:00
Mario Vavti	75e8aa8aee	bump version	2018-09-05 12:19:52 +02:00
zotlabs	9282a6a40b	Merge branch 'zap'	2018-08-30 21:30:46 -07:00
zotlabs	fc6f5fc320	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-30 21:29:21 -07:00
zotlabs	d00648f3e1	Merge branch 'red'	2018-08-30 21:27:20 -07:00
Mario Vavti	42093aedcf	db update to get rid of bogus activitypub xchans which got created due to a bug in the pubcrawl addon	2018-08-29 13:57:36 +02:00
zotlabs	1ec12c6a04	Merge branch 'zap'	2018-08-26 23:44:01 -07:00
zotlabs	8e24ee9471	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-26 23:42:29 -07:00
zotlabs	9beda708de	Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'.	2018-08-26 23:35:29 -07:00
zotlabs	403312140c	Merge branch 'zap'	2018-08-23 17:35:04 -07:00
zotlabs	ed0f780231	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-23 17:33:51 -07:00
zotlabs	29f809f078	clean up the admin summary page	2018-08-23 17:31:41 -07:00
zotlabs	9ce94bd414	product name	2018-08-22 17:53:17 -07:00
zotlabs	bc06233d10	Merge branch 'red'	2018-08-20 22:24:44 -07:00
zotlabs	066febdf40	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	2018-08-20 20:20:57 -07:00
zotlabs	57e75d9332	add affinity app and start some serious refactoring of mod_photos	2018-08-16 23:01:31 -07:00
zotlabs	e5529938ea	Suppress duplicate info() messages. This was done long for notice(), but info() was overlooked at that time.	2018-08-16 12:35:57 -07:00
Mario Vavti	10c5b46e3b	Merge remote-tracking branch 'mike/master' into dev	2018-08-14 13:04:37 +02:00
M. Dent	94393d27c8	Override helpfiles	2018-08-14 13:03:26 +02:00
zotlabs	f15c1c4e54	hubloc DB changes needed for z6	2018-08-13 21:18:20 -07:00
zotlabs	248d20c347	Merge branch 'red'	2018-08-13 20:36:40 -07:00