30684 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Michael Vogel	06e8d9db58	Merge pull request #5152 from tobiasd/20180531-regform ... the detected language was not stored during user creation	2018-05-31 14:31:33 +02:00
Tobias Diekershoff	9ea6d4b26d	the detected language was not stored during user creation	2018-05-31 08:27:27 +02:00
Michael Vogel	a2d03e1826	Merge pull request #5151 from tobiasd/20180531-de ... update DE translations	2018-05-31 08:26:19 +02:00
Pascal Deklerck	bdb82572ba	redo correct typo Bandwith to Bandwidth in mod/settings.php	2018-05-31 06:39:30 +02:00
Pascal Deklerck	de1e514be3	redo correct typo bandwith to bandwidth in mod/admin.php	2018-05-31 06:38:14 +02:00
Tobias Diekershoff	b130fad1c5	update DE translations	2018-05-31 06:37:54 +02:00
Pascal Deklerck	8fd33f89ea	undo change to mod/admin.php	2018-05-30 20:28:38 +02:00
Pascal Deklerck	307a19074f	undo changes to strings files	2018-05-30 20:22:34 +02:00
Hypolite Petovan	6bdcb6a15b	Merge pull request #5149 from tobiasd/20180530-msg ... regen master messages.po	2018-05-30 13:15:46 -04:00
Pascal Deklerck	e1dd1aa358	5147 Typo 'bandwith' should be 'bandwidth'	2018-05-30 08:50:29 +02:00
Tobias Diekershoff	b86326e04a	regen master messages.po	2018-05-30 05:41:30 +02:00
Hypolite Petovan	2e97cbe728	Merge pull request #5144 from annando/deleted-item ... Fix for not being able to delete items you don't own	2018-05-29 15:14:51 -04:00
Michael	c86111d193	Coding standards	2018-05-29 19:00:26 +00:00
Pascal	26927accb1	Merge pull request #1 from friendica/2018.05-rc ... 2018.05 rc	2018-05-29 20:57:43 +02:00
Michael	5bcb9daa43	Use local_user instead	2018-05-29 18:57:32 +00:00
Hypolite Petovan	ccbef51eff	Merge pull request #5143 from tobiasd/20180528-priv ... hide profile help text clarification	2018-05-29 11:03:43 -04:00
Hypolite Petovan	3341deee6a	Merge pull request #5145 from abanink/4419 ... 4419 Update the comments in src/Database/DBStructure.php from doc	2018-05-29 11:03:01 -04:00
Tobias Diekershoff	8eefe542df	rewording	2018-05-29 16:54:40 +02:00