17623 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Adam Magness	309ea7e7a4	Review updates ... update array to short form syntax	2018-01-15 11:33:02 -05:00
Hypolite Petovan	90545d0c66	Merge pull request #4249 from MrPetovan/develop ... Add use dba to Content\Widget	2018-01-15 10:40:50 -05:00
Hypolite Petovan	145dc37a53	Add use dba to Content\Widget	2018-01-15 10:39:27 -05:00
Hypolite Petovan	0fe832ef8a	Merge pull request #4246 from zeroadam/Widget-#3878 ... Move contact_widgets to src	2018-01-15 10:27:42 -05:00
Adam Magness	494f61a78f	Remove old file ... remove include/profile_selectors.php	2018-01-15 10:16:21 -05:00
Adam Magness	f53e54c705	Update functions and calls ... Update function name and calls.	2018-01-15 10:15:00 -05:00
Adam Magness	700eca70a9	Functions to ContactSelector ... put function in ContactSelector class	2018-01-15 10:08:47 -05:00
Adam Magness	d4178d482b	Remove old file ... remove include/contact_widgets.php	2018-01-15 09:50:45 -05:00
Adam Magness	6cf6029ff5	Rename functions and calls ... Rename functions and update calls	2018-01-15 09:50:06 -05:00
Adam Magness	0409aae719	Create Widget class ... create widget class in Friendica/Content.	2018-01-15 09:22:01 -05:00
Hypolite Petovan	3ab51bf5cb	Merge pull request #4245 from zeroadam/Mimetype-#3878 ... Move attach to src	2018-01-15 09:17:15 -05:00
Hypolite Petovan	224cfb2746	Merge pull request #4241 from annando/network-update ... Update after comment on public post should now work on the network page	2018-01-15 09:16:00 -05:00
Michael	94c349a720	Don't use count	2018-01-15 14:02:34 +00:00
Michael Vogel	cc3b6a265c	Merge pull request #4244 from MrPetovan/develop ... Composer: php-markdown updated to 1.8.0	2018-01-15 14:58:38 +01:00
Hypolite Petovan	53c5af0676	Composer: php-markdown updated to 1.8.0 ... - Classmaps updated	2018-01-15 08:56:45 -05:00
Adam Magness	edb8110555	Remove old file ... remove include/attach.php	2018-01-15 08:33:12 -05:00
Adam Magness	a80705a836	Function calls ... Rename function, update calls	2018-01-15 08:32:11 -05:00
Adam Magness	8e5e603008	Create mimetype class ... move attach.php function to mimetype class	2018-01-15 08:30:12 -05:00
Hypolite Petovan	35d334dd26	Merge pull request #4240 from annando/sql-definition ... SQL structure had changed	2018-01-15 07:37:13 -05:00
Hypolite Petovan	cb612c712d	Merge pull request #4237 from zeroadam/Profile-#3878 ... Move identity to src	2018-01-15 07:32:30 -05:00
Michael	5d03eb3dae	Some SQL servers report different lengths for unsigned types	2018-01-15 07:42:05 +00:00
Michael Vogel	7473b55961	Merge pull request #4238 from tobiasd/20180115-messages ... regenerated master messages.po file	2018-01-15 08:04:16 +01:00
Michael Vogel	cbbd7be6b3	Merge pull request #4239 from tobiasd/20180115-2018 ... Happy new year!	2018-01-15 08:03:54 +01:00
Michael	f18d459e46	Update after comment on public post should now work on the network page	2018-01-15 06:59:20 +00:00
Tobias Diekershoff	b3eddc6881	Happy new year!	2018-01-15 07:45:12 +01:00
Michael	7af564442a	SQL structure had changed	2018-01-15 06:43:28 +00:00
Tobias Diekershoff	628016f378	regenerated master messages.po file ... Signed-off-by: Tobias Diekershoff <tobias.diekershoff@gmx.net>	2018-01-15 07:37:47 +01:00
Michael Vogel	0e3fe14024	Merge pull request #4235 from MrPetovan/task/4116-remove-library-oauth2 ... Delete unused library/oauth2-php library	2018-01-15 07:33:26 +01:00
Adam Magness	430bd7c6ac	Review updates ... Update function name, descriptive variable names.	2018-01-14 23:44:39 -05:00
Adam Magness	41159cd14f	use	2018-01-14 21:41:56 -05:00
Adam Magness	0c5cc291af	More use ... more missing use statements	2018-01-14 21:38:26 -05:00
Adam Magness	2ef8d72b60	Missing use ... missing use statement for profile	2018-01-14 21:29:19 -05:00
Adam Magness	a01a8a06f2	Remove requires ... remove requires_once statment	2018-01-14 21:26:07 -05:00
Adam Magness	641ab5e247	Remove include/identity ... remove no longer used file	2018-01-14 21:23:18 -05:00
Adam Magness	4fb2547df8	Update function calls ... update function calls to use profile class	2018-01-14 21:22:39 -05:00
Adam Magness	4cfa46186a	Move include/identity to src ... Copy functions from identity to Profile class	2018-01-14 20:13:02 -05:00
Michael Vogel	448ae08dd5	Merge pull request #4231 from MrPetovan/bug/3639-fix-diaspora-lf-in-code-blocks ... Fix Diaspora LF in code blocks/Move php-markdown to composer	2018-01-15 01:37:13 +01:00
Hypolite Petovan	04481087a9	Delete unused library/oauth2-php library	2018-01-14 19:33:47 -05:00
Hypolite Petovan	fabbf810b0	Move library/markdown.php to src	2018-01-14 19:01:09 -05:00
Hypolite Petovan	903b960d4c	Improve babel page display	2018-01-14 19:01:09 -05:00
Hypolite Petovan	503e5847f9	Improve html2bbcode ... - trim code blocks - Add <code> conversion to <code> (from Diaspora)	2018-01-14 19:01:09 -05:00
Hypolite Petovan	f828afde83	Extend multi-line code blocks regular expression ... - Covers the case where there's no new line after the [code] tag	2018-01-14 19:01:09 -05:00
Hypolite Petovan	3e56a63162	Remove library/php-markdown	2018-01-14 19:01:09 -05:00
Hypolite Petovan	53f3d54ad3	Add michelf/php-markdown to Composer	2018-01-14 19:01:09 -05:00
Hypolite Petovan	a81dc7f5a8	Update Composer version	2018-01-14 19:01:08 -05:00
Hypolite Petovan	9babf0befd	Merge pull request #4234 from annando/participation-2 ... On participation send all the old content of the thread	2018-01-14 18:57:05 -05:00
Michael	b7022963f3	On participation send all the old content of the thread	2018-01-14 22:53:00 +00:00
Hypolite Petovan	f45cde798a	Merge pull request #4232 from fabrixxm/frio-login ... [WIP] Frio: restyle login page	2018-01-14 17:22:36 -05:00
Hypolite Petovan	64e3dbfaa4	Merge pull request #4225 from zeroadam/UserImport-#3878 ... Move include/uimport to src	2018-01-14 17:21:26 -05:00
Hypolite Petovan	b3c304c210	Merge pull request #4229 from annando/database ... Reworked and unified database structure, added comments	2018-01-14 17:16:20 -05:00