300 commits

Author	SHA1	Message	Date
redmatrix	a74631b554	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: boot.php include/items.php util/messages.po	2015-07-03 15:03:56 -07:00
redmatrix	0b9332fde9	in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly.	2015-07-03 14:30:42 -07:00
redmatrix	002be8f9ce	project updates	2015-06-26 16:37:55 -07:00
redmatrix	6bd90816dd	very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.	2015-06-19 16:39:03 -07:00
redmatrix	d01fbe521f	weekly string update	2015-06-13 15:00:22 -07:00
jeroenpraat	93237f8d0a	Added translatable strings to the Display Settings page and refreshed util/messages.po.	2015-06-06 19:49:30 +02:00
redmatrix	b832444dc2	string/version update	2015-06-06 00:06:26 -07:00
redmatrix	f3b95f591a	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-05-31 19:26:00 -07:00
redmatrix	edd228decb	strip images from directory text entries	2015-05-30 15:03:44 -07:00
redmatrix	851f2f64df	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: index.php mod/setup.php	2015-05-24 15:50:05 -07:00
redmatrix	ee14657863	add local_dir_update hook	2015-05-23 15:07:24 -07:00
redmatrix	76558df966	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po	2015-05-17 19:48:57 -07:00
redmatrix	9a67ec8bd4	new string file - isolating the projectname from translated strings so that translation files will work across multiple projects.	2015-05-17 16:33:43 -07:00
redmatrix	91d7b0f7eb	more work isolating the projectname from core.	2015-05-17 16:28:16 -07:00
redmatrix	0a644a2f41	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php	2015-05-10 13:26:44 -07:00
redmatrix	3140650b8f	rev update	2015-05-10 13:17:41 -07:00
redmatrix	75b8bfc07a	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-05-06 18:39:12 -07:00
redmatrix	f559c91b7a	turn consensus items into diaspora polls for that network	2015-05-05 19:23:21 -07:00
redmatrix	5b5f0666f9	second pass name change	2015-05-05 03:59:51 -07:00
redmatrix	a3c37f1458	first pass name change	2015-05-05 03:56:10 -07:00
friendica	b3ac1cd993	mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.	2015-04-24 00:56:06 -07:00
friendica	3d99a6b5c4	hide event share button when editing an event	2015-04-17 17:20:24 -07:00
friendica	e64de798b5	rev update, string update	2015-04-11 00:34:39 -07:00
friendica	f18621c6db	strings update	2015-04-03 17:14:09 -07:00
friendica	0aba609ad4	issue #941	2015-03-28 14:53:00 -07:00
friendica	01716dea3d	config to hide version tag from siteinfo - on my site it's meaningless.	2015-03-20 16:46:07 -07:00
friendica	ce33eca4b2	update to-do list	2015-03-13 01:22:32 -07:00
friendica	73891dc582	reverse smilie storage also	2015-03-06 03:04:04 -08:00
friendica	2b44c5fc72	Fix a couple of places where we weren't checking for dead hublocs. Add a function to mark a hubloc dead.	2015-02-27 13:43:12 -08:00
friendica	ccf1a131f1	doc update	2015-02-20 00:15:03 -08:00
friendica	7bb2e25ea0	missing param	2015-02-13 13:04:31 -08:00
friendica	7edab47658	get_rel_link broken - also weekly doc updates	2015-02-06 02:07:10 -08:00
friendica	ab0706521e	let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates	2015-01-30 13:45:28 -08:00
friendica	0cdcc4bc50	doc updates	2015-01-23 03:25:17 -08:00
friendica	8f8700ddd2	mod_prep usability enhancements, doc updates	2015-01-16 00:53:04 -08:00
friendica	c75cdbd304	doc updates	2015-01-10 13:04:43 -08:00
friendica	ed2917118d	doc updates	2015-01-02 17:26:57 -08:00
friendica	7ba92feabf	doc update	2014-12-26 00:13:22 -08:00
friendica	26105b53d4	doc updates	2014-12-19 00:29:10 -08:00
friendica	452d275b5e	don't import to sys channel from self-censored authors	2014-12-12 00:26:07 -08:00
friendica	58067c24fc	block adult channels from inclusion in public content feeds	2014-12-10 16:24:31 -08:00
friendica	123a778ae1	update mozilla cacert.pem	2014-11-28 18:48:10 -08:00
friendica	b16f938830	random block widget	2014-11-22 12:26:04 -08:00
friendica	f299922df3	minor changes to support forum mode	2014-11-15 14:03:41 -08:00
friendica	26343b8856	rev update	2014-11-07 05:15:28 -08:00
friendica	7f0bd5a6e5	doc updates	2014-10-31 05:05:31 -07:00
friendica	1d8aa7d817	string update	2014-10-24 04:17:35 -07:00
Jeroen	0950f90e66	New util/messages.po	2014-10-17 14:19:38 +00:00
friendica	cde244ef74	improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.	2014-10-10 00:13:46 -07:00
friendica	2bd4b36238	rev update	2014-10-03 03:35:01 -07:00