29248 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
rabuzarus	0882b2df97	Merge pull request #3779 from annando/event-data ... export event data for display purposes	2017-10-13 13:06:46 +02:00
Tobias Diekershoff	fd81a90eb8	Merge pull request #3783 from annando/diaspora-migration ... Diaspora: Support account migration	2017-10-13 12:59:47 +02:00
Michael	9286f5cf31	Added documentation	2017-10-13 10:49:51 +00:00
Michael Vogel	14fe3d60ae	Merge pull request #3782 from tobiasd/20171013-msg ... regenerated master messages.po file	2017-10-13 11:44:27 +02:00
Michael	b31b29c557	Now it could work	2017-10-13 09:41:01 +00:00
Michael	2b80bf4683	Improved documentation	2017-10-13 09:26:07 +00:00
Michael	09020192d6	Diaspora: Support account migration	2017-10-13 09:22:05 +00:00
Tobias Diekershoff	bdf0a62fdd	regenerated master messages.po file	2017-10-13 07:28:17 +02:00
Tobias Diekershoff	6a7b3f19ae	Merge pull request #3781 from annando/display-improvements ... Improve the data generation for the display page	2017-10-12 23:44:17 +02:00
Michael	5acdd18c00	Improve the data generation for the display page	2017-10-12 19:54:49 +00:00
Michael Vogel	f4859fbd8d	Merge pull request #3780 from AlfredSK/patch-1 ... Update vier with new global support forum	2017-10-12 18:07:25 +02:00
S.Krumbholz	80dde20c64	Update vier with new global support forum ... vier has a hardcoded path to the helpers forum as well. I've changed the path of the global support forum to https://forum.friendi.ca/profile/helpers.	2017-10-12 15:59:13 +02:00
Tobias Diekershoff	bc41a2b606	Merge pull request #3778 from annando/initialize-sql ... "dba" is now static	2017-10-12 07:24:16 +02:00
Michael	eeec1ea163	We should take the event-id as well	2017-10-11 20:45:03 +00:00
Michael	42a76bced9	export event data for display purposes	2017-10-11 19:51:18 +00:00
Michael	7b833834f9	Avoid basepath problems	2017-10-11 18:21:10 +00:00
Michael	225eea2ca6	Avoid undefined class variables	2017-10-11 14:52:08 +00:00
Michael	a29b7e7153	"dba" is now a static class	2017-10-11 12:56:36 +00:00
Tobias Diekershoff	57be4f047e	Merge pull request #3776 from annando/initialize-sql ... Checks if the database variable is initialized	2017-10-11 07:14:46 +02:00
Michael	dbcd1d1ae3	Additional check if the database object is initialized	2017-10-10 22:25:38 +00:00
Michael	63e02eb57f	Checks if the database variable is initialized	2017-10-10 22:18:57 +00:00
Michael Vogel	c2472d9981	Merge pull request #3774 from tobiasd/20171010-lng ... ES and PT BR translation work	2017-10-10 11:39:56 +02:00
Tobias Diekershoff	49cc514f29	Merge pull request #3775 from annando/ostatus-nick-change ... OStatus: Better handling of changed nicknames	2017-10-10 11:23:51 +02:00
Michael	763838c78d	OStatus: Better handling of changed nicknames	2017-10-10 09:13:37 +00:00
Tobias Diekershoff	0b66f3ed1e	update for ES thx Albert	2017-10-10 07:13:52 +02:00
Tobias Diekershoff	61095f7546	update for PT BR thx abinoam	2017-10-10 07:12:40 +02:00
Tobias Diekershoff	ed13034e23	Merge pull request #3773 from annando/force-republish ... Force a republish to the directory server	2017-10-09 21:39:24 +02:00
Michael	c8eefbd091	Force a republish to the directory server	2017-10-09 19:26:45 +00:00
Tobias Diekershoff	4c75c59039	Merge pull request #3772 from annando/relocate-ignore ... Process "relocate" messages even if we are ignoring a contact	2017-10-09 05:16:32 +00:00
Michael	09af73168c	Process "relocate" messages even if we are ignoring a contact	2017-10-09 05:02:50 +00:00
rabuzarus	62aa839876	Merge pull request #3771 from tobiasd/20171008-doc ... links in the docs	2017-10-08 14:00:57 +02:00
Michael Vogel	fd5cf0f147	Merge pull request #3770 from tobiasd/20171008-dotca ... .com -> .ca	2017-10-08 12:39:03 +02:00
Tobias Diekershoff	77471bccd3	changed links	2017-10-08 11:40:06 +02:00
Tobias Diekershoff	74eb0ae923	move to forum.friendi.ca	2017-10-08 11:38:26 +02:00
Tobias Diekershoff	8b9ce4a0ec	move to forum.friendi.ca	2017-10-08 11:25:35 +02:00
Tobias Diekershoff	495b639e55	.com -> .ca	2017-10-08 10:22:29 +02:00
Tobias Diekershoff	ab60641e3b	Merge pull request #3769 from annando/show-forum-posts ... When showing posts for a contact we have to tread forums in a special way	2017-10-08 05:29:41 +00:00
Michael	5d0e7d24ba	When showing posts for a contact we have to tread forums in a special way	2017-10-08 05:20:09 +00:00
rabuzarus	2ac3db7607	Merge pull request #3768 from annando/avoid-sql-error ... Avoid SQL error when in Forum view	2017-10-07 23:58:15 +02:00
Michael	ecce105ae8	Avoid SQL error when in Forum view	2017-10-07 21:51:03 +00:00
rabuzarus	829e8ca946	Merge pull request #3767 from annando/bugfix-search ... Bugfix: Wrong function in search	2017-10-07 22:39:33 +02:00
Michael	68c6788762	Bugfix: Wrong function in search	2017-10-07 19:51:49 +00:00
rabuzarus	22f4e3973e	Merge pull request #3766 from annando/trim-feed ... Feeds are now trimmed before importing	2017-10-07 20:40:33 +02:00
Michael	67e57a83df	Feeds are now trimmed before importing	2017-10-07 18:35:10 +00:00
Tobias Diekershoff	ef6a9e953a	Merge pull request #3765 from annando/resend-frio ... Frio: Relocate message wasn't send	2017-10-07 16:00:21 +00:00
Michael	df1e96441e	Frio: Relocate message wasn't send	2017-10-07 15:45:00 +00:00
Tobias Diekershoff	0f1b27db1e	Merge pull request #3764 from annando/contact-blocked ... Preparation for the possibility to globally block contacts	2017-10-07 13:10:39 +00:00
Michael	c6dbbe21b4	Preparation for the possibility to globally block contacts	2017-10-07 09:52:43 +00:00
Tobias Diekershoff	cc9074bed5	Merge pull request #3763 from annando/relocation-addr ... Fixes the not changed "addr" entry when an account is imported	2017-10-07 06:01:16 +00:00
Michael	ceb0dda486	Fixes the not changed "addr" entry when an account is imported	2017-10-07 05:20:46 +00:00