31502 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	e392491e94	Next try ;-)	2018-06-03 10:58:03 +00:00
Michael	b33578c137	Additional data for the test tool	2018-06-03 10:47:40 +00:00
Michael	443d828ba7	We don't need to look for the uid	2018-06-03 10:29:42 +00:00
Michael	28678c0fad	Reverting the last test	2018-06-03 10:22:10 +00:00
Michael	96d170c9d8	Trying to understand the test tool	2018-06-03 10:04:02 +00:00
Michael	6985ad4fb5	Improved error message	2018-06-03 09:55:41 +00:00
Michael	b654af28fa	We need "global"	2018-06-03 09:40:32 +00:00
VVelox	ea64ec21ac	a domain name is unlikely to be both a CNAME and A record	2018-06-03 04:29:06 -05:00
Michael	ea498ff283	And a second SQL error fixed	2018-06-03 09:21:48 +00:00
Michael	d76fb6d0b9	Fixed SQL error	2018-06-03 09:19:27 +00:00
Michael	f081f15096	Updated sql file	2018-06-03 08:46:23 +00:00
Michael	d7c477d0f4	Don't probe anymore, but ensure that we got good contact data	2018-06-03 08:36:05 +00:00
Michael	93fd04e381	Removed deprecated functionality	2018-06-03 07:48:13 +00:00
Michael	3f07d01dd1	Get rid of unneeded or redundant fields	2018-06-03 07:42:56 +00:00
Michael	a720c4f501	Removed unneeded fields from the API	2018-06-03 07:22:01 +00:00
Hypolite Petovan	0eafea86ed	Merge pull request #5163 from annando/bugfix-user-item ... Fix SQL error in tagcloud	2018-06-02 13:49:58 -04:00
Michael	41423e578a	Fix SQL error in tagcloud	2018-06-02 17:07:28 +00:00
Hypolite Petovan	bb11969c72	Merge pull request #5162 from tobiasd/20180602-de ... update DE translations	2018-06-02 10:09:44 -04:00
Tobias Diekershoff	4cca036a1b	update DE translations	2018-06-02 15:56:57 +02:00
Hypolite Petovan	541f8634c0	Merge pull request #5161 from annando/public-redir ... "redir" is now centralized	2018-06-02 09:18:10 -04:00
Michael	c6c94b8cea	Weird stuff	2018-06-02 13:00:47 +00:00
Michael	81c002370e	Only redirections to the same host do make sense	2018-06-02 08:42:46 +00:00
Michael	723b5ae803	Use MagicLinkbyId when possible	2018-06-02 08:28:01 +00:00
Michael Vogel	eb63bdc30c	Merge pull request #5160 from tobiasd/20180602-msg ... regen master messages.po	2018-06-02 10:27:37 +02:00
Michael	8a34895a23	Use magicLink whenever possible	2018-06-02 08:05:06 +00:00
Tobias Diekershoff	19ab854704	regen master messages.po	2018-06-02 08:49:58 +02:00
Michael	885f2b52d1	Merge remote-tracking branch 'upstream/develop' into public-redir	2018-06-02 06:18:45 +00:00
Tobias Diekershoff	e429c26396	Merge pull request #5159 from AndyHee/patch1 ... Rewording label	2018-06-02 07:54:12 +02:00
AndyHee	2b25bd48d4	Improved distinction between delete and remove	2018-06-02 12:40:41 +07:00
Michael	371f511954	Respect "don't fork"	2018-06-02 05:17:32 +00:00
Michael	3034170088	DBStruxture can now create "memory" tables as well	2018-06-02 05:03:23 +00:00
AndyHee	a75d28e521	Rewording label	2018-06-02 11:23:27 +07:00
Michael	6d64667cdb	Merge remote-tracking branch 'upstream/develop' into daemon	2018-06-02 04:03:55 +00:00
Hypolite Petovan	33c943a9dd	Merge pull request #5156 from annando/db-comment ... Small corrections to the database descriptions	2018-06-01 22:44:46 -04:00
Michael	047c02371a	Small corrections to the database descriptions	2018-06-01 22:12:35 +00:00
Michael	28f8beebfc	Workers can now be started exclusively from the daemon and other workers	2018-06-01 22:09:27 +00:00
Michael	b5b172500d	Merge remote-tracking branch 'upstream/develop' into public-redir	2018-06-01 12:32:51 +00:00
Tobias Diekershoff	8e461fb7bd	Merge pull request #5154 from MrPetovan/master ... Fix version number in database.sql	2018-06-01 13:48:50 +02:00
Tobias Diekershoff	69300291f0	Merge pull request #5155 from MrPetovan/develop ... Update develop	2018-06-01 13:48:18 +02:00
Hypolite Petovan	333e8d3512	Restore gitignore	2018-06-01 07:39:26 -04:00
Hypolite Petovan	93daf7883e	Merge branch 'master' into develop ... - Updated new develop version label - Incremented database build number	2018-06-01 07:30:04 -04:00
Hypolite Petovan	6d20785005	Fix version number in database.sql	2018-06-01 07:25:48 -04:00
Tobias Diekershoff	9553392c12	set the release date	2018-06-01 09:43:06 +02:00
Tobias Diekershoff	2a760bb770	Friendica 2018.05	2018-06-01 09:29:18 +02:00
Tobias Diekershoff	c598bf7d8f	Merge pull request #5096 from tobiasd/3.6.1 ... CHANGELOG	2018-06-01 09:25:49 +02:00
Michael	ae8d7267a0	"redir" is now centralized and works with the public contact	2018-06-01 06:46:34 +00:00
Tobias Diekershoff	ae897e5aeb	last minute bug fixes	2018-06-01 06:42:46 +02:00
Hypolite Petovan	dccf07c6d8	Merge pull request #5153 from tobiasd/20180531-nl ... update to the NL translation THX Pascal Deklerck	2018-05-31 11:15:11 -04:00
Tobias Diekershoff	d1a27550fa	update to the NL translation THX Pascal Deklerck	2018-05-31 16:38:31 +02:00
Hypolite Petovan	71ab86d0c3	Merge pull request #5150 from abanink/5147 ... 5147 Typo 'bandwith' should be 'bandwidth'	2018-05-31 10:35:24 -04:00