31143 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	f1535c0f01	use strlen instead of count as above (php7.2 fails)	2018-04-23 09:35:12 +02:00
Tobias Diekershoff	61a380975b	there are more then 1 test ATM	2018-04-23 08:53:46 +02:00
Tobias Diekershoff	c31a54175d	comment out use clause	2018-04-23 08:47:42 +02:00
Tobias Diekershoff	0a58637ace	phpunit compat 5.6 vs 7.x	2018-04-23 08:42:13 +02:00
Hypolite Petovan	a25c07b162	Merge pull request #4912 from annando/archivecontacts ... Added console command to manually archive contacts	2018-04-23 02:07:53 -04:00
Michael	b3d24f0ff2	DFRN: mark for archival at different places	2018-04-23 06:03:55 +00:00
Hypolite Petovan	aa6584684e	Merge pull request #4911 from tobiasd/20180423-travis ... travis indentation	2018-04-23 01:49:16 -04:00
Tobias Diekershoff	125f0df473	travix indentation	2018-04-23 07:42:48 +02:00
Michael	866fbb4d80	Added console command to manually archive contacts	2018-04-23 05:33:47 +00:00
Hypolite Petovan	3f3456efde	Merge pull request #4910 from tobiasd/20180423-lng ... translation updates DE and FI	2018-04-23 01:32:15 -04:00
Tobias Diekershoff	82bf2d984e	update DE translations	2018-04-23 07:13:10 +02:00
Tobias Diekershoff	fa38089a95	update FI translations THX Kris	2018-04-23 07:13:02 +02:00
Michael Vogel	b1a668a3ea	Merge pull request #4909 from MrPetovan/bug/4898-fix-php-72-warnings ... Fix PHP 7.2 warnings	2018-04-23 06:50:21 +02:00
Hypolite Petovan	00985fe340	Fix self warning in Util\Temporal	2018-04-23 00:03:27 -04:00
Hypolite Petovan	9b052b5ea8	Fix count() warning in Object\Post	2018-04-23 00:02:18 -04:00
Hypolite Petovan	b0564ea40d	Fix count() warning in Model\Profile ... - Replace x() calls with empty() in Profile::load - Remove extraneous $a->page['aside'] initialization	2018-04-23 00:01:46 -04:00
Hypolite Petovan	da4892b4d2	Fix count() warning in mod/friendica ... - Add default value for Config call	2018-04-23 00:00:29 -04:00
Hypolite Petovan	a84477ed2d	Fix count() warning in include/dba.php	2018-04-23 00:00:06 -04:00
Michael Vogel	0ff51c2b13	Merge pull request #4908 from rabuzarus/20180421_frio_some_missing_admin_templates ... frio - Bugfix - there was a wrong user count in admin-users template	2018-04-23 00:32:52 +02:00
Michael Vogel	37e5272f92	Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext ... Guess language from plaintext	2018-04-23 00:26:05 +02:00
rabuzarus	763b061a2b	frio - Bugfix - there was a wrong user count in admin-users template	2018-04-23 00:26:00 +02:00
Hypolite Petovan	4e9236e9e9	Merge pull request #4907 from rabuzarus/20180421_frio_some_missing_admin_templates ... Frio - rework admin users and admin contactblock template to be more consistant with other setting pages	2018-04-22 18:14:50 -04:00
rabuzarus	12e7b6c3c8	Merge pull request #4906 from MrPetovan/task/content-filter-one-liner ... Move content filter HTML in a template	2018-04-23 00:14:22 +02:00
Hypolite Petovan	087bfbc6a7	Forgot new line at end of file in templates/wall/content_filter.tpl	2018-04-22 18:13:13 -04:00
Hypolite Petovan	48122733b8	Move content filter HTML in a template	2018-04-22 18:02:00 -04:00
rabuzarus	04bdba0d78	frio - some work on the admin contactblock template to be more consistant with other setting pages	2018-04-22 23:06:06 +02:00
rabuzarus	76fdf5c910	Merge pull request #4905 from MrPetovan/task/content-filter-one-liner ... Add one-line content filter when there's only one reason	2018-04-22 23:00:05 +02:00
Andreas Neustifter	da24e282c6	Updated credits.txt.	2018-04-22 20:44:22 +00:00
Friendica	390983a331	Haromonize Find People Widget. ... In the right_aside on the /contacts page in the left aside there are almost identical widgets to search for contacts. Drop one and use common widget in both places.	2018-04-22 20:44:22 +00:00
Friendica	666375fed1	Move new member tips to tab bar. ... The new member tips link looks very misplaced and forlorn at the current position. Move it to the tab-bar (in a somewhat crude fashion, but its for 14 days/user only.)	2018-04-22 20:44:22 +00:00
Friendica	54cfbe039b	Only shown pagination when not empty. ... Currenty the pagination bar is always shown, even when no prev/next buttons are active. This only shows the bar when actual navigation is possible.	2018-04-22 20:44:22 +00:00
Friendica	226d90ad5a	Image in /contacts/xx is shifted. ... The contact image for a single contact in /contacts/xx is next to the contact name instead of below, fix that.	2018-04-22 20:44:22 +00:00
Hypolite Petovan	4cfb12e9d9	Add one-line content filter when there's only one reason	2018-04-22 14:28:34 -04:00
rabuzarus	5a82ee04bc	frio - some work on the admin users template to be more consistant with other setting pages	2018-04-22 20:23:24 +02:00
Hypolite Petovan	1585b5db45	Merge pull request #4904 from M-arcus/patch-4 ... [DOCS] Automatic install: Add documentation	2018-04-22 13:30:28 -04:00
Marcus Müller	74db460274	[DOCS] Install: Add intendation for list (en)	2018-04-22 19:28:27 +02:00
Marcus Müller	f62531fef8	[DOCS] Install: Add intendation for list (de)	2018-04-22 19:27:56 +02:00
Marcus Müller	b7410f6866	[DOCS] Installation: Fix minor text error	2018-04-22 19:11:37 +02:00
Marcus Müller	f6a76f4f8f	[DOCS] Installation: Update german instructions	2018-04-22 19:10:27 +02:00
Marcus Müller	ad95099948	[DOCS] Automatic install: Add documentation	2018-04-22 17:55:43 +02:00
Hypolite Petovan	d977ff78df	Uncomment some code in ItemContent::getPlaintextPost ... - I have no idea what I'm doing	2018-04-22 11:43:27 -04:00
Michael Vogel	6e9ed3f01b	Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence ... Only show event reminders of events attendyes or attendmaybe	2018-04-22 17:38:32 +02:00
rabuzarus	7f93d5c74b	Merge pull request #4903 from MrPetovan/bug/infinite-loop-in-dba-delete ... Add documentation for new $options parameter in dba::delete	2018-04-22 17:35:52 +02:00
Hypolite Petovan	952b057631	Merge pull request #4900 from annando/dfrn-rework ... Preparation for transmitting public posts via DFRN	2018-04-22 11:35:41 -04:00
Hypolite Petovan	273dde508b	Add default value doc for options.cascade in dba::delete	2018-04-22 11:34:41 -04:00
Hypolite Petovan	0a026515bd	Add documentation for $options parameter in dba::delete	2018-04-22 11:33:20 -04:00
Hypolite Petovan	82ed6fff9f	Use public_contact() instead of wrong query in Profile::getEventsReminderHTML	2018-04-22 11:29:55 -04:00
Hypolite Petovan	6b9706c558	Merge pull request #4901 from tobiasd/20180422-travis ... check more PHP version	2018-04-22 11:17:06 -04:00
Tobias Diekershoff	34a24711a3	check more PHP version	2018-04-22 14:56:59 +02:00
Michael	98c677f09f	Currently disabled	2018-04-22 11:33:32 +00:00