31567 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	2c00e3ad36	Merge pull request #4680 from MrPetovan/bug/4669-check-getInfoFromURL-parameter ... Check Image::getInfoFromURL parameter	2018-03-25 10:39:17 +02:00
Michael	ad3e4b894e	Update the public contact	2018-03-25 08:20:13 +00:00
Michael	abb49150db	Update the avatar	2018-03-25 08:15:22 +00:00
Hypolite Petovan	daffc27061	Move suppress_tags config to template ... - Add new item.suppress_tags template variable - Fix template formatting	2018-03-25 00:38:23 -04:00
Hypolite Petovan	09f04c1985	Add Image::getInfoFromURL return check	2018-03-24 20:03:55 -04:00
Hypolite Petovan	13f58abe05	Add parameter check in Image::getInfoFromURL	2018-03-24 20:03:28 -04:00
Hypolite Petovan	7f3db49742	Merge pull request #4679 from annando/issue-4673 ... Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'"	2018-03-24 18:59:04 -04:00
Michael	a0451e1c62	Merge remote-tracking branch 'upstream/develop' into update-self	2018-03-24 22:50:14 +00:00
Michael	e8e6436f08	Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'"	2018-03-24 22:27:04 +00:00
Hypolite Petovan	bcf9fa147e	Merge pull request #4678 from annando/issue-4666 ... Fix: No "not null" when text is replaced by varchar	2018-03-24 18:09:21 -04:00
Michael	5bca333bf0	Fix: No "not null" when text is replaced by varchar	2018-03-24 21:57:50 +00:00
Michael Vogel	b8ffa1dec7	Merge pull request #4677 from MrPetovan/bug/4670-fix-po2php-command ... Revert po2php command "fix"	2018-03-24 22:43:55 +01:00
Hypolite Petovan	11e68b70bb	Fix number constant used in Console\PoToPhp	2018-03-24 16:09:19 -04:00
Hypolite Petovan	91eb644743	Fix formatting in Console\PoToPhp	2018-03-24 16:08:56 -04:00
Hypolite Petovan	641bd5eaa6	Merge pull request #4674 from annando/acl-fix ... Fix the ACL problem issue 4616	2018-03-24 15:48:02 -04:00
Michael	341499e8ca	standards	2018-03-24 19:40:35 +00:00
Hypolite Petovan	7acb4b0434	Merge pull request #4676 from annando/clean-url ... Handle URL with unicode characters	2018-03-24 15:31:07 -04:00
Hypolite Petovan	9665f4ed41	Merge pull request #4675 from annando/group-delete ... Fix: Groups can now be deleted again	2018-03-24 15:25:26 -04:00
Michael	324baa6b8b	Removed test code	2018-03-24 18:48:40 +00:00
Michael	850d9b4c0b	Line feeds fixed, not change in functionality	2018-03-24 18:39:13 +00:00
Michael	885d794958	Fix ACL data	2018-03-24 18:38:05 +00:00
Hypolite Petovan	801d2ee166	Merge pull request #4671 from tobiasd/20180324-trans ... translation update DE and ZN CH	2018-03-24 11:40:35 -04:00
Tobias Diekershoff	b6839fae67	update to the zh-cn translation THX 朱陈锬	2018-03-24 16:09:45 +01:00
Tobias Diekershoff	4fbdf6506d	update for DE translation	2018-03-24 16:07:33 +01:00
Tobias Diekershoff	aaccee3aac	Merge pull request #4668 from MrPetovan/bug/4665-fix-console-hashbang ... Use correct /bin/bash hashbang in bin/console	2018-03-24 14:21:26 +01:00
Hypolite Petovan	cf56db9185	Use correct /bin/bash hashbang in bin/console	2018-03-24 08:40:43 -04:00
Hypolite Petovan	f293d2e993	Merge pull request #4667 from Alkarex/fix-bin-console ... Fix PHP cannot take a shell script	2018-03-24 08:38:29 -04:00
Alexandre Alapetite	e64196c7b3	Fix PHP cannot take a shell script ... Fix part of https://github.com/friendica/friendica/issues/4665 `php [shell file]` does not work, so use `php [php file]` instead. `php bin/console.php` is more robust than e.g. `bin/console` which does not work on Windows, or *nix systems without Bash	2018-03-24 12:47:40 +01:00
Michael	07a1796e8f	Fix: Groups can now be deleted again	2018-03-24 07:26:57 +00:00
Michael	bac60164e7	New function to keep the self contact updated	2018-03-24 06:15:18 +00:00
Hypolite Petovan	ed93fce743	Merge pull request #4662 from MrPetovan/bug/4660-restore-composer-5.6-compatibility ... Hotfix: Restore composer 5 6 compatibility	2018-03-23 20:53:52 -04:00
Hypolite Petovan	af4a206d7b	Merge pull request #4661 from MrPetovan/develop ... Hotfix: Bump database version number after RC merge	2018-03-23 20:53:07 -04:00
Hypolite Petovan	4e33f7f458	Restore executable permissions in bin/	2018-03-23 20:47:58 -04:00
Hypolite Petovan	07a175b29f	[Composer] Downgrade paragonie/constant_time_encoding to PHP 5.6 compatible version	2018-03-23 20:41:55 -04:00
Hypolite Petovan	9abe3dade2	Bump database version number after RC merge	2018-03-23 20:01:53 -04:00
Michael Vogel	96a6c098bc	Merge pull request #4657 from MrPetovan/task/3878-move-event-to-src ... Move include/event.php to src/	2018-03-23 21:24:20 +01:00
Hypolite Petovan	241ed9a9cd	Merge pull request #4658 from fabrixxm/dev/update-vagrant ... Edits to Vagrant dev env part 3	2018-03-23 15:40:20 -04:00
Michael	055855bf9b	Handle URL with unicode characters	2018-03-23 18:41:59 +00:00
fabrixxm	57e6b8ac1a	Dev env: fix cache test data	2018-03-23 18:19:29 +01:00
fabrixxm	3aa015d381	Merge pull request #4651 from MrPetovan/develop ... Update Develop with 3.6-rc changes	2018-03-23 17:21:35 +01:00
fabrixxm	f05e773a8c	Dev env: fix admin email	2018-03-23 17:16:22 +01:00
Hypolite Petovan	2cd2eff772	Merge pull request #4654 from fabrixxm/dev/update-vagrant ... Edits to Vagrant dev env - the missing part	2018-03-23 11:49:14 -04:00
fabrixxm	2e69bd95a0	update test data for dev env	2018-03-23 16:38:26 +01:00
Hypolite Petovan	705d1432ce	Merge pull request #4653 from fabrixxm/dev/update-vagrant ... Edits to Vagrant dev env	2018-03-23 11:23:00 -04:00
fabrixxm	dd37176a01	Fix Vagrant dev env ... - more consistent use of hostname - use .local hostname instead of .dev . Looks like Firefox is more happy with a self-signed certificate on .local than .dev - add friendica.local to altname in certificate - run composer install while provisioning	2018-03-23 16:12:11 +01:00
Hypolite Petovan	ecd660cb10	Updated version number	2018-03-23 06:39:51 -04:00
Hypolite Petovan	a7c48f40b7	Enable CalendarExport widget on /events	2018-03-23 06:34:21 -04:00
Hypolite Petovan	c5cd569447	Restore previous permission comment in Widget\CalendarExport	2018-03-23 06:34:21 -04:00
Hypolite Petovan	d36bc29ce9	Finally fix the permissions for Widget\CalendarExport	2018-03-23 06:34:21 -04:00
Hypolite Petovan	95792f6b79	Fix typo in mod/events ... - Add todo in Model\Event	2018-03-23 06:34:21 -04:00