friendica

Author	SHA1	Message	Date
Michael	83ce42172b	Don't add "redir" links on mentions	2017-08-27 09:56:41 +00:00
Michael	12ae59dba3	No linefeeds	2017-08-27 07:12:27 +00:00
Michael	d8acb62ba6	Small formatting issue	2017-08-27 07:02:44 +00:00
Michael	a36c8a0173	Possibly Issue 3611: Better feed handling when there is no body	2017-08-27 06:59:07 +00:00
Michael	a729519de9	And some more static warnings removed	2017-08-26 10:01:50 +00:00
Michael	c382f9f3d7	Some more	2017-08-26 07:52:49 +00:00
Michael	5adfeb0bd5	App::get_baseurl is now replaced with System::baseUrl	2017-08-26 07:32:10 +00:00
Michael	3c24bed412	New class "System"	2017-08-26 06:04:21 +00:00
Michael	b0c26921ad	Statically used methods should be defined statically as well	2017-08-25 15:56:08 +00:00
Tobias Diekershoff	959d6ae15e	Merge pull request #3654 from annando/externalpubsubhubbub Removed external pubsubhubbub URL	2017-08-25 09:47:58 +02:00
Michael	5c53544118	Removed external pubsubhubbub URL	2017-08-25 02:58:38 +00:00
Michael	2ecd5a55b7	Bugfix for "1" instead of "connect"	2017-08-24 19:11:27 +00:00
Tobias Diekershoff	417ea99ba5	Merge pull request #3650 from annando/feed-probing Probing sometimes failed / problems with some web servers	2017-08-24 10:16:24 +02:00
Michael	c09c806f78	Probing sometimes failed / problems with some web servers	2017-08-24 07:56:46 +00:00
Michael	ba52dd9fa7	Merge remote-tracking branch 'upstream/develop' into pleroma2	2017-08-24 06:26:58 +00:00
Michael	6998897a34	Limit the number of feed entries (Can solve resub problems)	2017-08-23 23:01:37 +00:00
Michael	e533572ca3	Issue 3645: Avoid problems with boolean values	2017-08-23 19:40:42 +00:00
Michael	b378f5fb01	The "hub" url now contains the nickname	2017-08-23 05:01:15 +00:00
Michael	51dca9b034	Compatibility with pleroma added	2017-08-21 20:21:04 +00:00
Michael	85c49060e2	Preparation for Unicode Emojis	2017-08-20 19:47:00 +00:00
Michael	17b05c9ad9	Hash tag links now do a redir	2017-08-19 09:22:50 +00:00
Michael	f8946c9e0a	When "local_search" is activated, then point all hashtags to the local server	2017-08-18 22:12:40 +00:00
Michael	e10bb40e1a	Added logging	2017-08-16 04:53:15 +00:00
Michael	791fc1d8b3	DFRN: Improved delivery status handling	2017-08-16 04:08:57 +00:00
Michael	6c9953809a	Improved position of "close"	2017-08-15 10:10:09 +00:00
Michael	a0567d4081	dbm::is_result now checks whether a dba:... call returns at least one result	2017-08-15 06:08:26 +00:00
Tobias Diekershoff	d2b7a44299	Merge pull request #3631 from annando/1708-libertree Shared posts to Libertree now look better.	2017-08-15 07:44:53 +02:00
Michael	3290ccc779	Now some more stuff is fixed	2017-08-14 21:46:58 +00:00
Michael	4f6f47f714	Now the bugfix really should work	2017-08-14 20:58:02 +00:00
Michael	2d99e86b12	Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value	2017-08-14 20:17:17 +00:00
Michael	3c59eefa22	Shared posts to Libertree now look better.	2017-08-14 19:16:28 +00:00
Michael	796cee6273	Cleaning code	2017-08-14 05:52:36 +00:00
Michael	1fa82581b6	Avoid warning	2017-08-14 05:47:25 +00:00
Michael	217a8ce6ee	Events now work again	2017-08-14 05:05:32 +00:00
Michael	0ac725dc47	Some more updated queries	2017-08-12 22:15:16 +00:00
Michael	41a81624a2	Now deletions will also work with complicated queries	2017-08-12 18:07:47 +00:00
Michael	89017d4e6c	DBA: The condition can now be a complex string	2017-08-12 13:54:29 +00:00
Michael	1d8c91c478	Restructured "dba::exists" function	2017-08-12 08:55:50 +00:00
Michael	b14b44e8a8	Merge remote-tracking branch 'upstream/develop' into dba-2	2017-08-12 07:37:06 +00:00
Michael	51f6c46923	Issue 3616: Don't create notifications for forum accounts	2017-08-12 05:08:45 +00:00
Michael	4ada71081f	No timeout problem anymore in preview.	2017-08-11 20:25:02 +00:00
Michael	556cc0cc4c	And some more changed lines	2017-08-11 19:26:08 +00:00
Michael	99f0c01cdd	Some more changed queries	2017-08-11 16:21:55 +00:00
Michael	d810b21f87	New dba functions	2017-08-11 08:04:01 +00:00
Michael	7b6664f0f7	Improved parameter handling	2017-08-10 12:38:32 +00:00
Michael	33b61ab262	Database connections should be closed	2017-08-10 06:33:24 +00:00
Michael	eb7cbb9ada	Now there are fewer than 300 updates left ...	2017-08-10 05:07:23 +00:00
Michael	bd8efb7f92	Several updates are transformed as well	2017-08-10 04:31:46 +00:00
Michael	03b86d3766	Now we have less than 100 insert commands, yeah	2017-08-09 23:02:57 +00:00
Michael	c6b04aa922	And some more inserts	2017-08-09 22:23:46 +00:00
Michael	6180d62ebc	Some more inserts	2017-08-09 22:04:00 +00:00
Michael	f248f9cc85	Merge remote-tracking branch 'upstream/develop' into new-dba	2017-08-09 21:42:51 +00:00
Michael	fce72cbbc8	Modifed "update" and "insert" function / many changed queries	2017-08-09 21:12:41 +00:00
Michael	b01ab3e64c	DBA: Do a fallback to other db functions on problems	2017-08-09 06:02:48 +00:00
Tobias Diekershoff	4d77c8a90a	Merge pull request #3618 from annando/mysqli-fix Quickfix for MYSQLi (prepared statement problem)	2017-08-08 09:32:26 +02:00
Michael	c3e1f88d4b	Quickfix for MYSQLi (prepared statement problem)	2017-08-08 06:07:04 +00:00
Johannes Schwab	37262c24d9	Catch exceptions in PDO constructor	2017-08-04 11:01:29 +02:00
Tobias Diekershoff	93fb98959a	Merge pull request #3613 from annando/some-ostatus Speed up of OStatus transmission/Ignoring "created" with remote self	2017-08-03 08:01:04 +02:00
Michael	1bd85971a4	Avoid some PHP warnings, no functional changes	2017-08-03 05:50:44 +00:00
Michael	a80329b416	Speed up of OStatus transmission/Ignoring "created" with remote self	2017-08-03 05:42:44 +00:00
Michael	c98ae304c0	Endless scroll now avoids showing the same items	2017-07-31 06:04:37 +00:00
Michael	57b4ea4759	Bugfix: The ACL lookup had its problems after the last changes	2017-07-27 14:02:25 +00:00
Tobias Diekershoff	f3f42ae3a2	Merge pull request #3602 from annando/1707-expiration Bugfix: the expiration check in item_store now works again	2017-07-23 22:21:30 +02:00
Michael	b266d7d6ff	Bugfix: the expiration check in item_store now works again	2017-07-23 19:59:29 +00:00
Tobias Diekershoff	152eec4f2f	Merge pull request #3597 from annando/1707-acl-separator In the acl there is now a separation between groups, forums and contacts	2017-07-23 10:27:40 +02:00
Michael	2e704d79eb	In the acl there is now a separation between groups, forums and contacts	2017-07-23 06:49:31 +00:00
Michael	8d66909ba5	Check general expiration time at item storing as well	2017-07-23 05:51:55 +00:00
Michael Vogel	0f67d82d05	Update socgraph.php Two little style changes	2017-07-21 19:36:13 +02:00
zotlabs	a583bda5fc	reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes.	2017-07-19 17:56:40 -07:00
Michael	4a7ca0d44f	Fix crash with expiration, false logger constant, no empty postings	2017-07-19 05:51:39 +00:00
Michael	a5baba84af	Only show the attachment elements if there are one.	2017-07-17 19:49:58 +00:00
Michael	1c8e74edce	Attachments now look fine.	2017-07-17 19:38:15 +00:00
Michael	f65d6531ca	Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach	2017-07-15 10:36:56 +00:00
Michael	2bad626be6	Bugfix: Signatures for likes hadn't been stored	2017-07-15 04:03:50 +00:00
Michael	b49a36f949	The attached image has now a class	2017-07-15 04:02:12 +00:00
Michael	181947f774	Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach Conflicts: include/text.php	2017-07-13 20:38:18 +00:00
Tobias Diekershoff	86934119b1	Merge pull request #3580 from annando/issue-3571-2 Reworked "get_contact"	2017-07-13 08:34:59 +02:00
Tobias Diekershoff	3334e0332d	Merge pull request #3582 from annando/duplicate-error Avoid duplicate database errors when storing the conversations	2017-07-13 08:30:20 +02:00
Michael	4c7a197f4b	Avoid duplicate database errors when storing the conversations	2017-07-13 06:00:53 +00:00
Michael	beaa911bac	Bugfix: Some special characters weren't converted correctly	2017-07-13 05:57:37 +00:00
Michael	568abd537a	Fixed error reporting	2017-07-12 08:14:36 +00:00
Michael	69f20959ff	Update existing contact records with data from probing	2017-07-12 06:07:22 +00:00
Michael	a47e1e13d7	Process all data that we can fetch via probing	2017-07-12 05:56:35 +00:00
Michael	35b3723c4a	database logging now works for database errors	2017-07-11 19:14:49 +00:00
Michael	8ec7f1de56	Issue 3571: Reworked "get_contact" function	2017-07-11 18:32:35 +00:00
Tobias Diekershoff	81dedb3f92	Merge pull request #3577 from annando/2in1 Issue 3571 and Diaspora mail bugfix	2017-07-11 08:31:39 +02:00
Michael	363322ba78	Issue 3571 and Diaspora mail bugfix	2017-07-10 22:35:32 +00:00
Michael Vogel	ef3398f09a	Merge pull request #3573 from irhen/issue-3529-fix-mega-age fix big age	2017-07-10 18:43:05 +02:00
irhen	c6137ca0df	is empty check	2017-07-10 14:17:06 +03:00
Tobias Diekershoff	6bbc1ac602	Merge pull request #3575 from annando/dfrn-update-copy DFRN: Update the public item copy as well	2017-07-09 10:17:22 +02:00
Tobias Diekershoff	5921fd03e5	Merge pull request #3574 from annando/further-expire-split Split the delete process into a separate expire process	2017-07-09 10:15:34 +02:00
Michael	9f92fddb00	DFRN: Update the public item copy as well	2017-07-09 04:29:35 +00:00
Michael	af181941db	Split the delete process into a separate expire process	2017-07-09 03:37:20 +00:00
irhen	534f79a5a5	fix big age	2017-07-08 23:30:30 +03:00
Dean Townsley	11d271f3c5	Only delete uid=0 entries when cleaning up extra public entries This delete can inadvertently remove contacts from normal users under some conditions. Since it appears to be intended to only operate on "public" (uid=0) contacts, this change constrains the delete query to only uid=0 records.	2017-07-08 09:55:40 -05:00
Tobias Diekershoff	d88584af69	Merge pull request #3567 from rjm6823/develop Contacts page directory link	2017-07-08 08:36:54 +02:00
RJ Madsen	d7de2e0750	Fixed minor spaces to tabs conversion	2017-07-06 17:33:30 -04:00
RJ Madsen	c4b40babb0	Switched to proper global directory instead of local directory	2017-07-06 17:31:36 -04:00
RJ Madsen	7593152bcb	re-named variable to match scheme	2017-07-06 16:37:55 -04:00
RJ Madsen	b7b8c5477b	Converted from space to tab indentation	2017-07-06 15:27:03 -04:00
RJ Madsen	255f38710c	Added global directory link to the find people side panel	2017-07-06 14:19:58 -04:00
Michael	30b0a035f9	Split expire.php in several processes / small worker changes	2017-07-06 05:48:02 +00:00
Michael	c8b1b51809	Improved logging	2017-07-04 05:31:42 +00:00
Michael	0ab7915810	Only kill the first stale process	2017-07-04 05:01:06 +00:00
Michael	bae4569a0b	Avoid the killing of the wrong process	2017-07-02 19:43:36 +00:00
Michael	0cd9db9cb7	Degrade priority step by step	2017-07-01 18:55:12 +00:00
Michael	7726353601	Prevent soon killings	2017-06-30 23:08:08 +00:00
Michael	99b86c9fd9	Just found the handbrake ...	2017-06-29 21:19:31 +00:00
Michael	18d6eba8d0	Some more performance stuff	2017-06-29 05:40:02 +00:00
Michael	4515c36f69	Semaphore based locking and hopefully the fix for the workerqueue	2017-06-28 04:53:11 +00:00
Michael	7097673fa1	Bugfix: Poller entries had been executed multiple times	2017-06-21 03:49:05 +00:00
Hypolite Petovan	ea88e15a8c	Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2 Coding convention applied split 2-6-2 (of 2-14-2)	2017-06-18 18:44:34 -04:00
Roland Häder	29ca5b3021	added missing curly brace ... :-( Signed-off-by: Roland Häder <roland@mxchange.org>	2017-06-18 23:15:50 +02:00
Roland Häder	c0a0748831	converted upper-case to lower-case as they are no constants but keywords Signed-off-by: Roland Häder <roland@mxchange.org>	2017-06-18 23:15:11 +02:00
Roland Häder	dc8f758860	Opps, also this! Signed-off-by: Roland Häder <roland@mxchange.org>	2017-06-18 22:14:31 +02:00
Roland Häder	470556764b	Fixed some stuff as requested by @Hypolite Signed-off-by: Roland Häder <roland@mxchange.org>	2017-06-18 22:10:03 +02:00
Tobias Diekershoff	b000012bc3	Merge pull request #3537 from annando/1706-diaspora2 We now use the new Diaspora protocol for sending	2017-06-18 21:31:25 +02:00
Michael	fda4cd6001	Changed documentation	2017-06-17 19:13:40 +00:00
Michael	ec8a945189	Corrected query	2017-06-17 14:15:17 +00:00
Michael	cf179188b6	Some more worker fine tuning	2017-06-17 13:58:18 +00:00
Michael	e33ac224b0	Now the Salmons flys	2017-06-17 08:58:28 +00:00
Michael	2ee8d1694f	Added documentation	2017-06-16 21:01:56 +00:00
Michael	9c4bf6b0d5	The new envelope could work now	2017-06-16 20:57:35 +00:00
Michael	c031482d7d	"unsharing" is now done different	2017-06-16 16:39:17 +00:00
Michael	5a11ef5b90	Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2	2017-06-16 06:10:35 +00:00
Michael	0dc1c932f8	We now should send all data in the new format	2017-06-16 05:21:25 +00:00
Michael	a453ae4f66	Removed unneeded stuff	2017-06-15 21:45:36 +00:00
Michael	f36ffe3c03	Just some more message types	2017-06-15 21:20:18 +00:00
Michael	6482495001	We now use the new Diaspora format while sending	2017-06-15 20:50:53 +00:00
Michael	bafa26c060	We don't need the timeout there anymore	2017-06-13 22:25:24 +00:00
Michael	a7526f1291	New function for affected rows	2017-06-13 21:56:50 +00:00
Roland Häder	4e49939421	Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 Signed-off-by: Roland Häder <roland@mxchange.org>	2017-06-13 23:26:06 +02:00
Michael	a056afd566	Small corrections	2017-06-13 20:51:24 +00:00
Michael	5183de8075	Don't fork these calls	2017-06-13 15:14:53 +00:00
Michael	21e84e4d25	Fetching new queue tasks in a bulk to increase speed	2017-06-13 13:51:25 +00:00
Michael	e232c683b6	Changed timeout, logging added	2017-06-13 09:03:19 +00:00
Michael	cd129665ef	örgs	2017-06-13 05:56:02 +00:00
Michael	97be344a4a	Handle deadlocks centrally	2017-06-13 05:52:59 +00:00
Michael	228993596a	Really fast, sadly with deadlocks	2017-06-12 21:39:20 +00:00
Michael	1301a29505	It's faster without locks, gnarl ...	2017-06-12 19:20:50 +00:00
Michael	1932a6d634	Replaced "table lock" - it is not so good, it seems	2017-06-12 14:19:47 +00:00
Michael	2372ef7fd5	Locking seems to be better here	2017-06-12 12:28:48 +00:00
Michael	dc00d89b9a	Remove test message	2017-06-12 09:45:13 +00:00
Michael	8be52424f5	Only check for stale processes every 5 minutes	2017-06-12 09:44:46 +00:00
Michael	4fdaca861b	Contact ID is integer	2017-06-11 20:25:51 +00:00
Michael	7d0a7f6be9	We got rid of two workerqueue queries, yeah!	2017-06-11 19:51:18 +00:00
Michael	06815f1a38	Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster Conflicts: include/poller.php	2017-06-11 07:49:34 +00:00
Michael	4f70682f7a	Inherit the creation date	2017-06-11 07:41:38 +00:00
Tobias Diekershoff	1838024f6d	Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators Replace explicit php logical operators	2017-06-09 07:44:19 +02:00
Hypolite Petovan	ad4cdf2a9d	Replace lowercase operators	2017-06-08 21:03:44 -04:00
rabuzarus	fa27256932	Merge pull request #3527 from annando/acl-speedup Increase the page load speed with Frio	2017-06-08 23:09:49 +02:00
Michael	34815de99c	Changed documentation	2017-06-08 21:00:45 +00:00
Michael	f1119b4198	Removed commented out line	2017-06-08 20:53:21 +00:00
Michael	8f336bffc2	further improvements to the workerqueue	2017-06-08 20:43:30 +00:00
Tobias Diekershoff	b9b047f2af	Merge pull request #3523 from annando/issue-2864 Issue 2864: Create a alternate link for every status	2017-06-08 10:45:36 +02:00
Michael	0541a62134	The function "construct_acl_data" isn't used at all, it seems. it is deactivated now	2017-06-08 03:56:42 +00:00
Hypolite Petovan	2281989866	Replace && by AND in SQL queries	2017-06-07 22:01:14 -04:00
Hypolite Petovan	9c0d2c31e8	Replace AND and OR in PHP conditions by && and \|\|	2017-06-07 22:00:59 -04:00
Michael	d5cc757943	Merge branch 'bugfix-index' of github.com:annando/friendica into acl-speedup	2017-06-07 20:26:00 +00:00
Michael	1916f7858f	Increase the page load speed with Frio	2017-06-07 19:51:37 +00:00
Michael	71a5de40f1	The index mustn't be 192 characters long	2017-06-07 18:34:17 +00:00
Michael	5aee2fde1b	Merge remote-tracking branch 'upstream/develop' into issue-2864	2017-06-07 18:17:37 +00:00
Michael	1b5f1effa0	Code beautification	2017-06-07 09:51:21 +00:00
Michael	2ad784d37a	Speeded up calling "proc_run"	2017-06-07 05:42:30 +00:00
Michael	6161ceff64	Merge remote-tracking branch 'upstream/develop' into 1706-lock	2017-06-07 05:28:37 +00:00
Michael	6e6941a546	We have an alternate link	2017-06-06 21:56:25 +00:00
Michael	4e748668c6	Spaces	2017-06-06 20:10:47 +00:00
Michael	910cca0629	Attached pictures in OStatus posts are now displayed	2017-06-06 17:55:14 +00:00
Michael	929f518e5c	Added documentation	2017-06-06 17:38:58 +00:00
Michael	de9cddc82f	Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced	2017-06-06 17:30:40 +00:00
Michael Vogel	f4652d6e50	Merge branch 'develop' into 1706-lock	2017-06-06 14:16:00 +02:00
Michael	f96423feae	Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock	2017-06-06 12:12:07 +00:00
Michael	8d13751d40	Increased database version	2017-06-06 12:07:27 +00:00
Michael	e00105d649	Don't fork a new worker	2017-06-06 11:59:38 +00:00
Tobias Diekershoff	f3d8da7d33	Merge branch 'master' into develop	2017-06-06 12:20:55 +02:00
Michael	ba7b4fddea	memory check is now also only done once in a while	2017-06-06 04:00:24 +00:00
Michael	2b04865cdb	We found the handbrake ...	2017-06-05 22:41:33 +00:00
Michael	2bff8e302a	Removing the lock after the process was removed is better	2017-06-05 16:56:21 +00:00
Michael	b86c4d539e	Locking waits now for a shorter period. DB locking is used at other locations as well	2017-06-05 14:59:53 +00:00
Michael	8db079c65e	Don't always fork the poller.	2017-06-05 06:08:26 +00:00
Michael	fb72fc77f5	Some code beautification	2017-06-04 20:03:37 +00:00
Michael	2d229ad856	Merge remote-tracking branch 'upstream/3.5.2rc' into 1706-lock	2017-06-04 19:06:40 +00:00
Michael	16276b21eb	Typo	2017-06-04 19:05:15 +00:00
Michael	bde4943da5	Every hour should mean: every hour :)	2017-06-04 19:01:22 +00:00
Michael	30b24a2908	Locking seems to work great now	2017-06-04 18:59:50 +00:00
Michael	bca5776e9c	Lock now can use the memcache as well	2017-06-04 15:59:20 +00:00
Michael	d2cb87a200	Database locks are now having its very own functions	2017-06-04 12:59:29 +00:00
Michael	ad53a03f83	It should be "e" not "p"	2017-06-04 09:00:07 +00:00
Michael	32f61016d3	Overhauled "lock" functionality	2017-06-04 07:26:21 +00:00
Michael	945d3cc048	The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions	2017-06-03 19:46:19 +00:00
Tobias Diekershoff	ec5a3c3440	Merge pull request #3514 from annando/worker-locking Fixed locking behaviour for the worker	2017-06-03 11:02:50 +02:00
Michael	21eb9a4b2e	Fixed locking behaviour for the worker	2017-06-03 07:25:01 +00:00
rabuzarus	8806688d68	restructure the conditions if gnetwork and gaddr is empty	2017-06-01 12:47:47 +02:00
rabuzarus	a726056c5f	use get_contact_details_by_url() instead of Probe:uri()	2017-06-01 11:44:59 +02:00
rabuzarus	8311af3e92	use Probe:uri() instead of probe_url	2017-05-31 18:43:57 +02:00
rabuzarus	df7acc7655	Bugfix: don't probe for introduction if it is not necessary	2017-05-31 14:29:33 +02:00
gerhard6380	1a0e8723c5	corrected change sorry, I should not change code late in the evening when I am already tired.	2017-05-31 10:33:35 +02:00
gerhard6380	bbddea03e9	API: link to original page for feed posts link to original page added to html output of feed posts if body is empty	2017-05-31 02:24:09 +02:00
Michael	81c87885cf	Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced	2017-05-30 21:07:28 +00:00
Michael	f6d10198cc	Bugfix: The poller often couldn't store the pid in the workerqueue	2017-05-30 13:20:29 +00:00
Michael	c9ea18ce74	Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced	2017-05-29 20:54:43 +00:00
Michael	a32de855cc	Don't quit if the own host cannot be reached via SSL	2017-05-29 19:14:44 +00:00
Michael	104acec09c	The database structure is now checked ad the admin summary page	2017-05-28 08:39:41 +00:00
Michael	497778ef54	Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced	2017-05-25 06:03:08 +00:00
Michael	646ef9842c	Bugfix: pubsubpublish has always to be called with high priority	2017-05-25 03:04:26 +00:00
Michael	d649873f80	Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced	2017-05-24 20:55:12 +00:00
Michael	3d14fa3d81	Priority needs to be integer	2017-05-24 10:36:44 +00:00
Michael	d2dd0b3248	Minimal poll intervall	2017-05-24 08:21:05 +00:00
Michael	d7de7bb70a	Optimized priorities for the automated expiring of items	2017-05-24 06:29:47 +00:00
Michael	8abdbb799a	Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced	2017-05-23 08:13:37 +00:00
Michael	1bd6d7dd7a	Bugfix OStatus: Avoid empty author data	2017-05-23 05:28:51 +00:00
Roland Häder	e9c9c47a84	Continued a bit: - opps, cherry-pick/rebase/what-ever did not take all over - used x() for array key check Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-22 13:09:07 +02:00
Roland Häder	291af19f25	Some improvements Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-22 13:06:22 +02:00
Michael	ac65423de1	Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced	2017-05-20 20:08:24 +00:00
Michael	44efdc3e1b	Central item expiration routine for external items	2017-05-20 20:02:06 +00:00
Michael	6e8e326705	Bugfix: Timeout problems when saving profile settings	2017-05-19 06:01:13 +00:00
Michael	192a5e254a	Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail	2017-05-17 19:56:38 +00:00
Michael	696404739b	Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short	2017-05-17 19:25:30 +00:00
Roland Häder	b6648215b8	Opps, missed them Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 18:42:40 +02:00
Roland Häder	98b407218d	Fixes: - don't do $string[position] anymore, use substr() instead - 'extends' was hanging loose there, rewrote it twice to fix parser error Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 18:39:10 +02:00
Roland Häder	0e0fb2b1ee	removed TODOs Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 18:34:16 +02:00
Roland Häder	11c16f1123	Continued: - added more curly braces - replaced if (blaFoo()) { return true; } return false; with return blaFoo(); - added spaces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 18:32:03 +02:00
Roland Häder	0394004fee	reverted comments, but maintained multi-line comment. Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 18:11:22 +02:00
Roland Häder	4c2d4934f7	Some CR applied: - removed todo - added explanation - merged next if() block with already merged Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 18:06:13 +02:00
Roland Häder	f55ea4bc83	tpzo fixed again ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 18:02:44 +02:00
Roland Häder	afb430b908	tpzo fixed Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 15:41:01 +02:00
Roland Häder	249065b421	opps, went in again? :-/ Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 15:31:46 +02:00
Roland Häder	031d96d933	improved some comments Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-17 15:28:01 +02:00
Roland Haeder	635b26353c	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-05-17 15:08:15 +02:00
Roland Haeder	347803fd5c	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-05-17 15:08:15 +02:00
Roland Haeder	f66c5c6823	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-05-17 15:07:31 +02:00
Michael	cb3077b7a9	It is better this way	2017-05-17 06:07:55 +00:00
Michael	7daf5ecde1	Use the contact picture instead of the profile picture	2017-05-17 06:00:20 +00:00
Michael	80103f8ad9	Issue 3309: Avatar update should work now	2017-05-16 21:21:54 +00:00
Roland Häder	d7b420a44e	opps, re-introduced this out-dated code by mistake Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-16 20:13:08 +02:00
Roland Häder	79d524a9ad	opps, added missing curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-16 17:56:36 +02:00
Roland Haeder	f4a33ed3f0	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-05-16 14:40:07 +02:00
Roland Haeder	701e761c68	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-05-16 14:37:12 +02:00
Hypolite Petovan	48e3f4f47f	Merge pull request #3465 from annando/bugfix-dba-1 Bugfix: dba::num_rows hadn't checked the object variable	2017-05-16 02:05:16 -04:00
Michael	41f94a62fc	Spelling	2017-05-16 06:00:01 +00:00
Michael	124690cc4d	dba: Beautification is now a separate function	2017-05-15 21:06:17 +00:00
Michael	875592f285	API: Direct Messages via the API now work again.	2017-05-15 20:11:33 +00:00
Michael	83e4141639	Bugfix: dba::num_rows hadn't checked the object variable	2017-05-15 15:17:38 +00:00
Michael	05c890f256	Bugfix: The commit in dba::delete was never executed	2017-05-14 07:01:38 +00:00
Michael	e884090efa	Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba Conflicts: include/uimport.php	2017-05-13 04:13:07 +00:00
Michael	74a0a92742	Just some more dba::delete	2017-05-13 04:04:17 +00:00
Hypolite Petovan	2bbcbdc704	Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2 Coding convention applied split 2-4-2 (of 2-14-2)	2017-05-12 21:40:30 -04:00
Roland Häder	cc4b481bc9	fixed parser error, need parentheses Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-12 21:02:58 +02:00
Michael	2b180d7804	Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba	2017-05-12 16:12:00 +00:00
Michael	377fe31907	dba functions in poller / avoiding SQL errors in conversation / dbclean is better	2017-05-12 16:09:25 +00:00
Hypolite Petovan	06ea23665c	Merge pull request #3460 from annando/1705-dbclean dbclean is now using the new database functions	2017-05-12 11:45:27 -04:00
Michael	acd9f453d7	And another one	2017-05-12 06:55:04 +00:00
Michael	58b2b1dbef	Some more cleaner delete	2017-05-12 06:30:45 +00:00
Michael	11e524a555	This item removal is much more cleaner	2017-05-12 06:17:48 +00:00
Michael	c00a5223d6	Removed code from the pre worker era.	2017-05-12 04:33:52 +00:00
Hypolite Petovan	4293e27d5c	Improved usage of `use` in dba_pdo	2017-05-11 23:05:49 -04:00
Hypolite Petovan	c0a6f1122b	Removed useless usage of `use`	2017-05-11 23:01:49 -04:00
Michael	c52f7657ab	Now it should work	2017-05-11 20:19:43 +00:00
Michael	6ef24890bb	dbclean is now using the new database functions / new functions for commit, rollback and transaction	2017-05-11 20:13:45 +00:00
Hypolite Petovan	39f894bd4a	Use `use` instead of `\`	2017-05-11 11:53:04 -04:00
Roland Häder	7a9456d5ac	Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 Fixed some stuff: - converted some files from DOS to Uni* (CRLF -> LF) - removed trailing white-spaces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-11 14:54:26 +02:00
Hypolite Petovan	6f6b029c4d	Merge pull request #3456 from annando/1704-mastodon-html HTML for OStatus posts look better (in Mastodon and GNU Social)	2017-05-08 16:54:45 -04:00
Michael	3db3d2f1f7	This should make posts fine on GNU Social as well	2017-05-08 19:11:47 +00:00
Michael	f602ec30cc	Shared links create now a better HTML	2017-05-08 18:11:37 +00:00
Michael	722e03cc58	Added documentation	2017-05-08 17:29:46 +00:00
Michael	aa4eafc304	Even better?	2017-05-08 14:31:37 +00:00
rabuzarus	cc8a3a4101	rename methods of the Probe class to camelCase	2017-05-08 16:19:10 +02:00
Michael	5abef34284	Should work now ...	2017-05-08 14:02:32 +00:00
Michael	3f975f6751	More URL can be styled	2017-05-08 12:35:44 +00:00
Michael	2002fc8a2a	Better design for links in Mastodon posts	2017-05-08 12:18:30 +00:00
Tobias Diekershoff	1f58bcc114	Merge pull request #3418 from gerhard6380/develop New API calls for photo management	2017-05-08 06:56:24 +02:00
Michael Vogel	6680ce1dd7	Merge pull request #3445 from Hypolite/improvement/move-probe-to-src Move Probe to src	2017-05-07 23:14:22 +02:00
Hypolite Petovan	45ec3fb5d8	Add missing include/probe require for probe_url support	2017-05-07 17:08:32 -04:00
Michael	2c11e91e65	The first queries are replaced with the new functions. More to come ...	2017-05-07 20:52:00 +00:00
Hypolite Petovan	92550861e9	Updated doc in include/probe.php - Fix standards	2017-05-07 15:00:38 -04:00
Hypolite Petovan	3a2988c3fd	Rename include/Scrape to include/probe	2017-05-07 14:45:19 -04:00
Hypolite Petovan	36e515ee6d	Move Probe to src	2017-05-07 14:44:30 -04:00
Hypolite Petovan	82b423c5ac	Fix require_once format	2017-05-07 14:40:23 -04:00
Hypolite Petovan	1c38540f20	Merge pull request #3444 from annando/1705-mail-duplicates Mails shouldn't be duplicated anymore when sending	2017-05-07 13:45:34 -04:00
Michael	824141d3e5	Mails shouldn't be duplicated anymore when sending	2017-05-07 17:11:09 +00:00
Hypolite Petovan	86cae070f2	Merge branch 'develop' into improvement/move-app-to-src-2	2017-05-07 12:58:11 -04:00
Hypolite Petovan	12cc5f8360	Merge pull request #3443 from annando/1705-diaspora-new-salmon Diaspora: Accept new Salmon format	2017-05-07 12:56:12 -04:00
Michael	eb0a701590	Just some more fixes to the protocol and the avatar stuff	2017-05-07 15:58:32 +00:00
Michael	ee817e81a2	Bugfix: Status messages had used the wrong field / rearranges parameter order	2017-05-07 14:36:50 +00:00
Michael	aa88691bc1	Diaspora: Accept new Salmon format	2017-05-07 13:11:11 +00:00
Michael Vogel	9c3e968581	Merge pull request #3442 from Alkarex/any_value_dbstructure Fix GROUP BY in dbstructure	2017-05-07 12:16:10 +02:00
Alexandre Alapetite	354531bfa6	Generate field_list only when needed https://github.com/friendica/friendica/pull/3442/files#r115137722	2017-05-07 11:07:34 +02:00
Alexandre Alapetite	f838430535	Fix GROUP BY in dbstructure https://github.com/friendica/friendica/issues/3440	2017-05-07 10:53:38 +02:00
Michael	054e40de65	And another one	2017-05-07 08:18:50 +00:00
Michael	7a3bdbfc15	Wrong parameter for delete command	2017-05-07 08:12:36 +00:00
Michael	8dd8936dd0	DESC should be ASC - this is more logically.	2017-05-06 12:46:31 +00:00
Michael	3ca70e6362	New function "dba::select" to fetch table rows	2017-05-06 11:32:18 +00:00
Hypolite Petovan	a849a25470	Merge pull request #3433 from annando/1705-check_server Set "last_failure" on connection timeout when checking server	2017-05-05 21:41:52 -04:00
Hypolite Petovan	96fb743364	Merge pull request #3434 from annando/1705-unique-index Some useful unique indexes	2017-05-05 21:41:19 -04:00
Hypolite Petovan	3f4502155d	Merge pull request #3432 from annando/1705-api Twidere reported error 501 when accessing a profile	2017-05-05 17:57:30 -04:00
Michael	6a594ca8a9	Some useful unique indexes	2017-05-05 21:55:19 +00:00
Michael	9ab0a9299e	Set "last_failure" on connection timeout when checking server	2017-05-05 20:51:45 +00:00
Hypolite Petovan	b9d64be59f	Merge pull request #3431 from annando/issue-3318 Issue 3318: Make sure that we fetch an author	2017-05-05 16:38:59 -04:00
Michael	f132e27bc9	Twidere reported error 501 when accessing a profile	2017-05-05 20:36:56 +00:00
gerhard6380	877ecf6d04	changed sql for photo table from to avoid memory issues on large photo tables	2017-05-05 22:29:25 +02:00
Michael	30476623c5	Issue 3318: Make sure that we fetch an author	2017-05-05 19:41:41 +00:00
Michael	e11ff8bde5	Issue 3428: Autocompletion now always show user@domain.tld	2017-05-05 11:55:01 +00:00
Michael	8d97bc61f5	Mastodon now does return a version number	2017-05-05 05:36:43 +00:00
Hypolite Petovan	0c64178de7	Merge pull request #3426 from annando/1705-diaspora-again Diaspora: Better handling for unrelayed comments and likes	2017-05-04 03:33:13 -04:00
Michael	65823fe28f	Standards and documentation	2017-05-04 05:11:19 +00:00
Michael	a9c263a375	Retraction does now work as well	2017-05-03 19:55:33 +00:00
Michael	d7b56db996	Diaspora: Better handling for unrelayed comments and likes	2017-05-03 19:28:51 +00:00
Michael	353074850e	It is now possible to connect to a db server with host:port	2017-05-03 19:22:44 +00:00
Michael	e1ab0c9475	Now comments are really working	2017-05-03 05:22:39 +00:00
Hypolite Petovan	569cd459ec	Add basepath to App	2017-05-02 23:37:57 -04:00
Hypolite Petovan	3437e73ae4	Yet more standards	2017-05-02 23:37:50 -04:00
Hypolite Petovan	70563e0324	Minor fixes, including overzealous replacement of app -> App	2017-05-02 23:37:30 -04:00
Hypolite Petovan	ce866ad39b	Remove unrecommended leading backslash for fully qualified namespaces	2017-05-02 23:37:06 -04:00
Hypolite Petovan	1d427aa214	Standards: Remove EOF closing PHP tags	2017-05-02 23:36:56 -04:00
Hypolite Petovan	4b16de6d80	Fix wrong class name case - Use leading backslash for non-namespace class names in App	2017-05-02 23:36:46 -04:00
Hypolite Petovan	20043914e6	Move App to src - Add `use Friendica\App;` wherever needed	2017-05-02 22:59:36 -04:00
Hypolite Petovan	56ee734b00	Cleanup /format pre-move	2017-05-02 22:59:24 -04:00
Michael	83e50385a8	Hopefully this fixes the workflow	2017-05-02 21:06:56 +00:00
Michael	99a54df8d8	Follow up for PR 3421 - some improvements	2017-05-02 19:48:11 +00:00
Michael	f639a86d02	Comments from unknown people never reached us	2017-05-02 18:42:01 +00:00
Michael	b767a47527	PR 3419: Avoid problems with PHP7 and dba.php	2017-05-02 10:47:53 +00:00
Tobias Diekershoff	5ef44ad71b	Merge pull request #3415 from annando/1704-db-relation New function to recursively delete data	2017-05-02 08:37:06 +02:00
gerhard6380	38f476eedb	end code with exception where cause is not clear should better be thrown as 500 InternalServerError instead of 400 BadRequest as the request was ok (all checks before passed).	2017-05-02 01:16:54 +02:00
Michael	d106ff5086	Error reporting hadn't worked for the new functions	2017-05-01 21:38:37 +00:00
gerhard6380	6a4d1fca88	change line endings to unix	2017-05-01 22:19:48 +02:00
gerhard6380	cd2ed72b37	coding convention applied	2017-05-01 22:16:22 +02:00
gerhard6380	a2ccdf1fec	coding conventions applied	2017-05-01 22:05:33 +02:00
Michael	0241a88c0d	Avoid duplicated queries	2017-05-01 19:54:08 +00:00
Michael	b9b43e30e6	Delete queries are now split into chunks.	2017-05-01 17:42:37 +00:00
gerhard6380	8d95e4ffc8	remove "not implemented by now" comment for update_profile_image	2017-05-01 16:48:45 +02:00
gerhard6380	2275fecec0	line breaks by mistake reversed	2017-05-01 16:47:17 +02:00
gerhard6380	e267d07c91	change line endings from VS	2017-05-01 16:45:22 +02:00
gerhard6380	5b35901716	new api calls for photo management within clients	2017-05-01 16:38:39 +02:00
Michael	e90ae79d35	The number of queries is reduced dramatically	2017-05-01 09:34:15 +00:00
Michael	e6cbe3be11	This is better	2017-05-01 06:35:41 +00:00
Michael	0d7996d852	Only fetch the rows when needed	2017-05-01 05:45:36 +00:00
Michael	f1c53530a1	Add a missing relation	2017-04-30 20:19:47 +00:00
Michael	c2820c452f	Delete now works	2017-04-30 19:54:41 +00:00
Thomas Willingham	7177cc3858	Accidentally included a self-loathing verb.	2017-04-30 11:16:04 +01:00
Thomas Willingham	6eff506cdd	Add the dlogger	2017-04-30 11:14:38 +01:00
Michael	44beb62e5a	Added information about table relations	2017-04-29 23:33:02 +00:00
Hypolite Petovan	9ff4fed7d2	Merge pull request #3408 from annando/1704-conversation-2 Conversation data is stored for own posts as well/improved function dba:update	2017-04-29 16:37:53 -04:00
Michael	9d9909cf10	Some more places were we check now	2017-04-29 17:45:09 +00:00
Michael	715e15cbe1	There is now a memory limit for the poller	2017-04-29 17:36:46 +00:00
Michael	10ea759282	Don't update the conversation only because the source changed	2017-04-29 08:30:43 +00:00
Michael	0e4cd900d5	Improved dba:update function.	2017-04-29 07:50:09 +00:00
Michael	edbbdf9761	Store conversation data for self created posts as well	2017-04-29 05:44:13 +00:00
Michael	c0b5339691	There is now a function to store conversations	2017-04-28 16:35:53 +00:00
Tobias Diekershoff	50da541860	Merge pull request #3402 from annando/1704-conversation OStatus improvements (Mastodon) and new SQL functions	2017-04-28 10:00:12 +02:00
Michael	9900d28c4b	We should return a return value when we say that we have a return value.	2017-04-28 06:21:12 +00:00
Michael	7240b2198b	Missed protocol ...	2017-04-28 06:03:04 +00:00
Michael	782783aa52	New function "dba::update" and changed unique index for the conversations	2017-04-28 05:50:27 +00:00
Michael	3b5e1bbfc3	dba:p and dba:e can now be called with a parameter array as well.	2017-04-28 04:47:28 +00:00
Michael	615197e044	We should escape the table name as well.	2017-04-28 04:05:50 +00:00
Michael	35dc56c9c2	Salmons with Mastodon seem to work now	2017-04-27 20:38:46 +00:00
Hypolite Petovan	9c53108a3e	Use Config::get instead of get_config	2017-04-26 22:08:47 -04:00
Michael	45d73b106b	Conversation data is now stored in another table	2017-04-26 21:16:25 +00:00
Hypolite Petovan	188d3a6f5e	Renamed check_domain_blocklist to blocked_url - Remove debug	2017-04-26 00:23:01 -04:00
Hypolite Petovan	8d469c155a	Add check_blocklist to z_fetch_url and post_url - Standard compliance	2017-04-25 22:59:11 -04:00
Hypolite Petovan	c7e1a8e871	Added check_domain_blocklist	2017-04-25 22:45:56 -04:00
Michael	2e4db2e64e	Merge remote-tracking branch 'upstream/develop' into 1704-conversation	2017-04-25 20:23:38 +00:00
Michael	d11e3afc6c	Added class description	2017-04-25 16:05:26 +00:00
Michael	4c131362b3	Better debugging	2017-04-25 05:20:34 +00:00
Michael	67bae59c66	Small corrections	2017-04-25 05:11:04 +00:00
Michael	8de510e635	We weren't able to test mysqlnd, so better remove the code	2017-04-24 21:51:47 +00:00
Michael	eb63ce5df5	Free results	2017-04-24 21:36:04 +00:00
Michael	ec0d2a1a03	Little spelling problem	2017-04-24 21:23:00 +00:00
Michael	b5f10e5ddb	Replace spaces by tabs	2017-04-24 21:20:24 +00:00
Michael	ed437e978a	Code cleanup	2017-04-24 21:18:30 +00:00
Michael	82f13441bc	Removed old functions	2017-04-24 21:02:51 +00:00
Michael	9959da5a1c	New function to calculate rows	2017-04-24 20:32:35 +00:00
Michael	d67338a895	New function to check for the existance of data	2017-04-24 19:23:49 +00:00
Michael	0c8a2fd345	Örgs	2017-04-24 06:28:57 +00:00
Michael	d636bcb9d3	Restored privates variables	2017-04-24 06:27:59 +00:00
Michael	311c029bcf	Rearranged lines	2017-04-24 06:26:49 +00:00
Michael	34bb34b9a4	Lost lines are back	2017-04-24 06:24:03 +00:00
Michael	28a28f00a4	New function skeleton for execution of queries	2017-04-24 06:13:42 +00:00
Michael	63b0b05445	We now can work with prepared statements	2017-04-23 23:15:38 +00:00
Michael	05dcedb54c	Merge remote-tracking branch 'upstream/develop' into 1704-conversation	2017-04-23 14:25:35 +00:00
Michael	2628ff91f4	Call it "toinnodb"	2017-04-22 21:55:16 +00:00
Roland Haeder	1dc4b60a5a	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-22 23:41:04 +02:00
Roland Haeder	2ef3251293	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-22 23:41:04 +02:00
Michael	aaa558f7ea	New command in dbstructure.php to convert all tables from MyISAM to InnoDB	2017-04-22 21:36:01 +00:00
Michael	c0784f7301	New tables for conversations	2017-04-22 20:46:40 +00:00
Hypolite Petovan	0f67934e05	Merge pull request #3375 from Quix0r/rewrites/coding-convention-split2-3-2 Coding convention applied split 2-3-2 (of 2-14-2)	2017-04-22 09:11:18 -04:00
Hypolite Petovan	affb3938d2	Merge pull request #3376 from annando/1704-key-length Issue 3358: The key length should now work on InnoDB and MyISAM	2017-04-21 20:41:45 -04:00
Alexandre Alapetite	7f1c71c9fd	Fix SQL date format bug in dfrn https://github.com/friendica/friendica/issues/3336 https://github.com/friendica/friendica/pull/3338	2017-04-22 00:00:13 +02:00
Michael	fef0fe2fb9	Issue 3358: The key length should now work on InnoDB and MyISAM	2017-04-21 21:26:05 +00:00
Roland Haeder	299c0122f6	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-21 20:08:57 +02:00
Roland Haeder	cdff732044	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-21 20:08:57 +02:00
Sandro Santilli	a6c6287288	Fix Config::get call	2017-04-21 17:36:45 +02:00
Sandro Santilli	e2a0a72598	Use Config::get	2017-04-21 17:09:06 +02:00
Sandro Santilli	05b6891e89	Allow specifying cookie lifetime via config variable Tweak $a->config['system']['auth_cookie_lifetime']	2017-04-21 16:15:39 +02:00
Sandro Santilli	e9f1a2e276	Expire log-in cookie in 90 days rather than 7	2017-04-21 15:16:12 +02:00
Roland Häder	b7c21e1b65	fixed parser error Signed-off-by: Roland Häder <roland@mxchange.org>	2017-04-20 22:59:43 +02:00
Roland Haeder	ec57babf89	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-20 22:59:08 +02:00
Hypolite Petovan	792ed55ae6	Merge pull request #3367 from annando/1704-mastodon Reworked OStatus communication part to better support Mastodon.	2017-04-20 02:12:41 -04:00
Hypolite Petovan	01dab95d60	Merge pull request #3366 from annando/issue-3358 Issue 3358; Avoid key length problems when changing collation	2017-04-20 02:03:30 -04:00
Michael	3592f90910	Merge remote-tracking branch 'upstream/develop' into 1704-mastodon Conflicts: include/bbcode.php	2017-04-20 05:44:31 +00:00
Michael	2354cc243e	Issue 3358; Avoid key length problems when changing collation	2017-04-20 05:24:08 +00:00
Michael	c6e7f6306c	Some standards	2017-04-20 05:17:00 +00:00
Hypolite Petovan	37efb5725e	Remove debug	2017-04-19 23:31:38 -04:00
Hypolite Petovan	8680068037	Remove vcard Edit link pointing to profiles for contacts	2017-04-19 21:58:33 -04:00
Michael	e16fb74b0c	Reworked OStatus communication part to better support Mastodon.	2017-04-19 21:37:00 +00:00
Roland Häder	9739758c42	added curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-04-19 23:07:59 +02:00
Roland Häder	b9d8587f41	Merge branch 'develop' into rewrites/coding-convention-split2-1-2	2017-04-19 23:06:01 +02:00
Roland Häder	98edbde05c	added braces, opps Signed-off-by: Roland Häder <roland@mxchange.org>	2017-04-19 23:03:44 +02:00
Hypolite Petovan	5432af3414	Merge pull request #3363 from sesom42/develop displays the correct profile for contacts that have set the default profile	2017-04-19 15:45:38 -04:00
Jens Tautenhahn	a8c20013c4	displays the correct profile for contacts that have set the default profile	2017-04-19 20:25:25 +01:00
Hypolite Petovan	bf1199f2ea	Standards	2017-04-19 10:14:43 -04:00
Hypolite Petovan	941dd48b53	Add explicit parentheses in condition	2017-04-19 07:05:48 -04:00
Hypolite Petovan	83ab3e3307	Skip lang file search if lang=en	2017-04-18 19:21:26 -04:00
Michael	828ae671f0	Handle the case when the given contact url or address is empty	2017-04-18 18:50:01 +00:00
Michael	47fd9226c3	Resubmit all profiles on directory change	2017-04-17 21:39:11 +00:00
Hypolite Petovan	1955d3d1b8	Merge pull request #3349 from annando/1704-api-owner API: The "friendica-owner" has only to be different from the user on starting posts	2017-04-17 13:00:58 -04:00
Michael	1681d18693	API: The "friendica-owner" has only to be different from the user on starting posts	2017-04-17 14:38:13 +00:00
Hypolite Petovan	457cec3e0d	Merge pull request #3321 from Alkarex/MySQL5.7 Fix for MySQL 5.7+ NO_ZERO_DATE	2017-04-16 16:03:13 -04:00
Michael	d80a09c9e5	Doxygen header added	2017-04-16 13:37:42 +00:00
Michael	3e6f501bc0	Print out database error messages	2017-04-16 13:21:49 +00:00
Alexandre Alapetite	6b250d3ae9	Merge branch 'develop' into MySQL5.7	2017-04-16 15:16:58 +02:00
Tobias Diekershoff	4e5b926d23	Merge pull request #3343 from annando/1704-mastodon Discover Mastodon servers	2017-04-16 10:23:07 +02:00
Michael	dc0ce4e08c	Discover Mastodon servers	2017-04-16 07:46:04 +00:00
Hypolite Petovan	d1fd797d6e	Merge pull request #3323 from Alkarex/ostatus-only_full_group_by Fix MySQL bugs related to only_full_group_by	2017-04-15 18:32:50 -04:00
Alexandre Alapetite	062070058e	Move any_value_fallback() to dba class https://github.com/friendica/friendica/pull/3323#discussion_r111666245	2017-04-15 17:31:32 +02:00
Alexandre Alapetite	06f374b26b	Document any_value_fallback() https://github.com/friendica/friendica/pull/3323#discussion_r111663767	2017-04-15 14:39:41 +02:00
Alexandre Alapetite	5007be3cf5	Use server_info to fallback from ANY_VALUE if needed	2017-04-15 12:40:32 +02:00
Alexandre Alapetite	d2b3e0daf5	Merge develop	2017-04-15 01:03:21 +02:00
Alexandre Alapetite	1058b28cea	MySQL ANY_VALUE with fallback to MIN https://github.com/friendica/friendica/issues/3322	2017-04-15 00:42:44 +02:00
Michael	e7783e2018	Merge remote-tracking branch 'upstream/develop' into issue-3326	2017-04-14 22:30:48 +00:00
Roland Häder	9423db628f	Merge branch 'develop' into rewrites/coding-convention-split2-1-2 Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 17:56:51 +02:00
Roland Haeder	fcf095cc6e	always surround operators like +,-,. with spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 17:43:01 +02:00
Roland Haeder	851c0284ee	added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 17:40:49 +02:00
Roland Haeder	ccbe7dd353	opps, missed this space ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 17:36:59 +02:00
Roland Haeder	a8136898b4	Opps, fixed parser errors Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 17:04:09 +02:00
Roland Haeder	03d23838f5	Continued: - added curly braces/spaces - added TODOs (type-hints, old-lost code) - more usage of dbm::is_result() - combined some if() return stuff into a simple return statement Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 17:00:51 +02:00
Roland Haeder	629fcd48bd	tpzo fixed ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 16:27:21 +02:00
Roland Haeder	f2f20c85d5	added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 16:27:06 +02:00
Roland Haeder	be59fe86e5	added space + type-hinted $a (App) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:29:50 +02:00
Roland Haeder	3a197833cd	added space Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:28:30 +02:00
Roland Haeder	753b432ab2	fixed intending Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:27:45 +02:00
Roland Haeder	83d6d68efd	removed some parentheses, but left them in where a string was concated Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:25:12 +02:00
Roland Haeder	3feece56dc	Continued a bit: - rewrote 2 multi-line single comments to one multi-line comment - added TODO for rewriting function to closure (CR request) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:14:39 +02:00
Roland Haeder	cf4bacdbd6	fixed spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:12:11 +02:00
Roland Haeder	8e1b6186f1	CR: added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:11:10 +02:00
Michael	d7537e7346	We only need to define the collation.	2017-04-14 12:22:36 +00:00
Michael	2930601719	it should work now	2017-04-14 11:26:47 +00:00
Michael	fdcb6d3c6f	Issue 3326: We are now completely working with utf8mb4	2017-04-14 07:58:56 +00:00
Tobias Diekershoff	b8fd48dddc	Merge pull request #3335 from annando/issue-3331 Issue 3331: Remove unneeded table "deliverq"	2017-04-14 07:32:30 +02:00
Michael Vogel	79e827417c	Merge pull request #3319 from Hypolite/issue/#3316 Use get_contact_by_url for unknown contacts in acl_lookup	2017-04-14 07:24:27 +02:00
Hypolite Petovan	bffd3f2304	Add htmlentities to protect nick/addr in acl_lookup	2017-04-13 18:33:40 -04:00
Hypolite Petovan	ad53764832	Merge pull request #3338 from annando/issue-3336 Issue 3336: The date format should now be okay	2017-04-13 15:48:25 -04:00
Michael	319284c665	Issue 3336: The date format should now be okay	2017-04-13 19:25:00 +00:00
Michael	d5c6f67a4a	Changed documentation	2017-04-13 19:10:53 +00:00
Hypolite Petovan	96b1a00e91	Fiddling with the unknown contact array values	2017-04-12 21:32:06 -04:00
Alexandre Alapetite	325d3afe18	Bump DB version	2017-04-12 23:14:33 +02:00
Alexandre Alapetite	b8e4094e7b	Allow negative contact.contat-type https://github.com/friendica/friendica/issues/3328	2017-04-12 23:09:22 +02:00
Alexandre Alapetite	74b6d09e89	Fix GROUP BY in acl_selector, api, notifier, photos, messages https://github.com/friendica/friendica/issues/3322	2017-04-12 15:11:50 +02:00
Hypolite Petovan	6b8ad57399	Add error handling for missing contacts	2017-04-11 21:18:34 -04:00
Alexandre Alapetite	15a44d945b	Another GROUP BY fix for MySQL https://github.com/friendica/friendica/issues/3322	2017-04-12 01:06:08 +02:00
Alexandre Alapetite	dbbe6efd27	Fix ostatus bug related to only_full_group_by https://github.com/friendica/friendica/issues/3322	2017-04-12 00:19:05 +02:00
Alexandre Alapetite	d2901dcb00	Fix for MySQL 5.7+ https://github.com/friendica/friendica/issues/2786 Only tested on Ubuntu 16.10 with MySQL 5.7.17. https://dev.mysql.com/doc/refman/8.0/en/timestamp-initialization.html https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_no_zero_date As of MySQL 5.7.4, NO_ZERO_DATE is deprecated. Patch based on the following search & replace (and then reverting some changes in libraries): ```sh grep -l '= "0000-00-00"' -r . \| xargs sed -i -e "s/= \"0000-00-00\"/= '0000-00-00'/g" grep -l "0000-00-00" -r . \| xargs sed -i -e "s/0000-00-00/0001-01-01/g" grep -l "!= '0001-01-01'" -r . \| xargs sed -i -e "s/!= '0001-01-01'/> '0001-01-01'/g" grep -l " === '0001-01-01'" -r . \| xargs sed -i -e "s/ === '0001-01-01'/ <= '0001-01-01'/g" grep -l " == '0001-01-01'" -r . \| xargs sed -i -e "s/ == '0001-01-01'/ <= '0001-01-01'/g" grep -l "strpos(\$dob, '0000-') === 0" -r . \| xargs sed -i -e "s/strpos(\$dob, '0000-') === 0/strpos(\$dob, '0000-') === 0 \|\| strpos(\$dob, '0001-') === 0/g" grep -l 'array("", "0001-01-01")' -r . \| xargs sed -i -e 's/array("", "0001-01-01")/array("", "0000-00-00", "0001-01-01")/g' grep -l "\$dob = '0000-'" -r . \| xargs sed -i -e "s/\$dob = '0000-'/\$dob = '0001-'/g" ```	2017-04-11 23:00:45 +02:00
Michael Vogel	0d2bf557de	Merge pull request #3315 from Hypolite/issue/#3285 Add spoiler tags for Mastodon Content Warning	2017-04-11 18:28:43 +02:00
Hypolite Petovan	762e8eda7a	Use get_contact_details_by_url for unknown contacts - Fix typo - Fix comment - Fix closure	2017-04-11 02:41:19 -04:00
Hypolite Petovan	21bb47a2e5	Added "braces" for @annando	2017-04-11 02:12:14 -04:00
Hypolite Petovan	ca7c2bfa00	Ignore Activity Streams `delete` messages from Mastodon	2017-04-10 22:20:03 -04:00
Hypolite Petovan	7f2fddea69	Add network for unknown contacts in ACL	2017-04-10 22:10:05 -04:00
Hypolite Petovan	05a5e1792d	Left trim at sign from nicks in ACL	2017-04-10 22:09:49 -04:00
Hypolite Petovan	e45da5bcd3	Rewrote code according to @annando feedback - Normalize boolean operators	2017-04-10 21:11:28 -04:00
Hypolite Petovan	ada5c4cc6a	Add Content Warning support for comments too Doh!	2017-04-10 00:57:36 -04:00
Hypolite Petovan	69d157c319	Add spoiler tags for Mastodon Content Warning	2017-04-10 00:08:14 -04:00
Michael	5c75fe4c14	Avoid possible problems with numeric nicknames and GNU Social	2017-04-09 04:29:02 +00:00
Roland Haeder	e325c6ec85	opps, missed this one. Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-09 00:28:48 +02:00
Roland Haeder	3778b15b7c	not on develop was this code in, but here? :-/ Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:09:31 +02:00
Roland Haeder	d07236deb6	huh? missed again Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:08:22 +02:00
Roland Haeder	cd697e0d7c	more spaces! ;-) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:07:40 +02:00
Roland Haeder	0319517f94	more curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:06:56 +02:00
Roland Haeder	6ff0b15873	more spaces + curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:05:56 +02:00
Roland Haeder	577e93e9fc	added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:04:33 +02:00
Roland Haeder	bc5d1015b3	added curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:03:21 +02:00
Roland Haeder	a66f6fe668	more spaces and curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:01:04 +02:00
Roland Haeder	80f41991a5	curly braces were missing again ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:50:29 +02:00
Roland Haeder	622b532f23	more spaces again ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:49:32 +02:00
Roland Haeder	676e956a72	some more spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:45:44 +02:00
Roland Haeder	85d5592180	added curly braces + spaces (CR) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:43:38 +02:00
Roland Haeder	3051d30c88	added spaces (CR) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:40:19 +02:00
Roland Haeder	215cae204d	again develop and this branch differs ... (no blame on cherry-picking though) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:38:40 +02:00
Roland Haeder	d94e878714	opps, was somehow missed to cherry-pick/merge ? + converted multiple single-line comments into one multi-line comment Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:36:38 +02:00
Roland Haeder	61cfa9e42d	Opps! Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:31:54 +02:00
Roland Haeder	a69f3017fb	Cleanups: - made SQL keywords all uper-case - put all SQL columns in back-ticks - added curly braces - added/removed spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:31:09 +02:00
Roland Haeder	f6c667ef45	more spaces + curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:22:33 +02:00
Roland Haeder	8ba461db0a	removed spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:17:20 +02:00
Roland Haeder	78b9cf97e0	huh? was in develop branch but not here? Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:12:31 +02:00
Roland Haeder	3d386daf53	no spaces here ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:11:51 +02:00
Roland Haeder	3220234693	more spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:10:50 +02:00
Roland Haeder	a0e5f7a59a	added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please note that PHP5 allows 'array' as type-hint already (+ interface/class name). Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:05:50 +02:00
Roland Haeder	8191bcc402	more spaces + curly braces + converted multiple single-line comments to one mult-line comment Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 18:52:15 +02:00
Roland Haeder	a4d60b65f1	fixed spacing + intending Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 18:49:01 +02:00
Roland Häder	3d1626781d	Merge branch 'develop' into rewrites/coding-convention-split2-1-2	2017-04-08 18:45:59 +02:00
Michael	c94525938d	Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed	2017-04-08 10:05:01 +00:00
Michael	8786bcdf0a	Avoid duplicates with feeds and "remote self"	2017-04-08 08:12:14 +00:00
Michael Vogel	56c0675fba	Merge pull request #3295 from Hypolite/issue/#3274 Friendica code blocks aren't rendered in Diaspora	2017-04-07 22:59:44 +02:00
Tobias Diekershoff	6060f311e9	small fix for #3254	2017-04-07 11:26:11 +02:00
Hypolite Petovan	b0accf4d4c	Fix code blocks to Diaspora - Extracts code blocks before BBCode conversion to prevent code highlighting and whitespace meddling - Use the improved HTLM To Markdown library - Use <code> instead of <key> for Diaspora inline code blocks	2017-04-06 23:49:56 -04:00
Hypolite Petovan	8149e21add	Enforce standards	2017-04-06 23:43:55 -04:00
Roland Haeder	20f8b63fca	unspaced ... ;-) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:45:43 +02:00
Roland Haeder	32ffe4a711	more spaces/curly braces added Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:40:09 +02:00
Roland Haeder	a4773a1ac0	added more spaces + fixed tpzo: occurence Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:34:35 +02:00
Roland Haeder	28c08467fd	Continued a bit: - added spaces/curly braces - used x($foo, 'bar') instead of isset($foo['bar']) - let's wrap html_entity_encode() somehow Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:31:33 +02:00
Roland Haeder	ddd875bba0	added more spaces (CR) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:23:57 +02:00
Roland Haeder	5a28eae59d	Opps, fixed parser error ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:20:19 +02:00
Roland Haeder	737a6670af	Continued a bit: - more spaces added - more curly braces added - let's use x($_FOO, 'bar') and not isset($_FOOT['bar']) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:18:03 +02:00
Roland Haeder	2a2e55e53d	overworked api.php: - added 'new' keyword because 'throw Exception' won't work - removed self-advertisement - added tons of spaces - added tons of curly braces - removed parentheses from require/include - more usage of dbm::is_result() - still there is a lot todo Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 22:11:09 +02:00
Roland Haeder	33e938a837	added spaces + used x() the proper way Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 19:36:01 +02:00
Roland Haeder	57b6e4c636	added spaces (CR) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 19:34:38 +02:00
Roland Haeder	849e56e3a5	added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 19:27:44 +02:00
Roland Haeder	64cf909ca2	added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-05 19:26:37 +02:00
Hypolite Petovan	1ab28bbe03	Add Text_Highlighter to Composer - Fixes critical mistake in boot.php regarding set_include_path - Fixes minor mistake in text.php regarding strpos order of arguments Note: This change significantly increases Composer running time because Text_Highlither is a PEAR package. I'm already planning to replace it with scrivo/highlight.php.	2017-04-05 00:31:49 -04:00
Roland Haeder	03571f6e74	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-04 19:46:56 +02:00
Hypolite Petovan	9237b2611a	Merge branch 'develop' into rewrites/coding-convention-split2	2017-04-03 06:35:27 -04:00
Michael	c574c317ef	Removed unneeded comment	2017-04-02 20:43:54 +00:00
Michael	884c75a350	Issue 3278: Attachments in Reshares should now work	2017-04-02 19:18:11 +00:00
Michael Vogel	d9451ef969	Merge pull request #3279 from Hypolite/improvement/add-composer Add Composer	2017-04-02 14:57:37 +02:00
Michael	94f3f0887b	Issue 2957: The avatar problem with mastodon should now finally be solved	2017-04-02 12:37:22 +00:00
Michael	54f49169d4	Show real platform names	2017-04-02 07:53:55 +00:00
Michael	07fd61b912	Mastodon: plink for reshares, missing hostnames for avatars	2017-04-01 23:39:19 +00:00
Roland Häder	49527b70d3	Merge branch 'develop' into rewrites/coding-convention-split2	2017-04-01 22:16:08 +02:00
Michael	16d4392573	Documentation added	2017-04-01 09:05:56 +00:00
Michael	f6d7ee2781	Issue 3142: mcrypt is no more (as well as phpseclib)	2017-04-01 08:28:42 +00:00
Hypolite Petovan	799e60aa62	Replace existing autoloader with Composer-supplied - Move Friendica namespace to `src` - Move required `ezyang/htmlpurifier` to vendor - Remove existing static autoloader - Change boot.php reference to the autoloader	2017-03-31 23:02:38 -04:00
Roland Haeder	8bdc906013	Continued a bit: - added 'array' type-hint which is valid for many versions back - added spaces as requested by CR - removed $a = get_app(); call, $a was no longer needed here Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:42:20 +02:00
Michael	3796a141c6	We don't need this include anymore	2017-03-31 06:25:48 +00:00
Michael	1560534621	Now it's openssl - and no copy&paste failure anymore	2017-03-31 06:22:43 +00:00
Michael	973fcd3624	Test with OpenSSL	2017-03-30 23:21:52 +00:00
Roland Haeder	d091759888	space to the rescue ... ;-) CR request Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 20:34:14 +02:00
Michael	54c8fb2bb8	Replaces mcrypt with phpsec.	2017-03-30 18:29:12 +00:00
Michael	4fc1ebd4ea	Doing some Hypolyzation	2017-03-27 21:02:56 +00:00
Michael	c85331d8ac	Reestablish the communication with Mastodon	2017-03-27 20:58:15 +00:00
Tobias Diekershoff	8580cd87a6	Merge pull request #3271 from Hypolite/issue/#3189 Fix Diaspora code blocks being mangled	2017-03-27 09:26:39 +02:00
Michael	fa7721c735	Prevent Hypolite from doing comments about standards ;-)	2017-03-27 06:11:45 +00:00
Michael	364d88fa70	Only import new OStatus posts if they are from our followers	2017-03-27 05:33:43 +00:00
Hypolite Petovan	3e285a690a	Fix Diaspora code blocks being mangled - Remove whitespace removal code from `diaspora2bb()` - Add code block skipping the HTML transforms removing whitespace in `htm2bbcode()`	2017-03-26 19:00:04 -04:00
Hypolite Petovan	f1a75a57fe	Merge pull request #3257 from annando/1703-gcontact Improved gcontact handling	2017-03-25 15:35:41 -04:00
Michael	585c2119d7	Remove the "call by reference"	2017-03-25 18:00:56 +00:00
Roland Haeder	9ddb032bf2	strange that this curly brace didn't make it in. now it is, thanks to @annando Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 18:32:33 +01:00
Roland Haeder	33fa1e79af	some spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 18:32:21 +01:00
Michael	444de52859	Use of exceptions	2017-03-25 16:56:04 +00:00
Tobias Diekershoff	6e35c49cb9	Merge pull request #3263 from annando/1601-api-statuses-lookup More GNU Social compatibility for the API	2017-03-25 16:26:21 +01:00
Michael	adf9ed64bb	Avoid API error when calling "/api/friendica/profile/show"	2017-03-25 14:16:21 +00:00
Roland Haeder	0e6b009425	fixed another parser error, opps Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 15:04:07 +01:00
Roland Haeder	fccdc63964	Opps, fixed parser error. indending was confusing here + added much more curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 14:56:23 +01:00
Roland Haeder	a391ab9a99	was a bit confusing for me or I was not sleeping to much ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:46:51 +01:00
Roland Haeder	89bd080e7e	don't kill when no result is found, this may break communication, thanks to @annando explaining it Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:42:09 +01:00
Roland Haeder	6d5826e188	PHP5 does not support native type-hints, except `array` + used dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:38:11 +01:00
Roland Haeder	fd468f20fd	merged 2 if() into one, closes internal TODO Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:08:56 +01:00
Roland Haeder	47ae5a9a47	removed parentheses, added curly ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:07:33 +01:00
Roland Haeder	2f5c796886	removed TODO, one day this all needs refacturizing ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:02:09 +01:00
Michael	a9dfd1fcb7	One more API call added	2017-03-25 11:31:31 +00:00
Michael	4665cda00e	Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup	2017-03-25 11:25:47 +00:00
Michael	0d49143a63	"no_utf" wasn't in use anymore - it is now removed completely	2017-03-25 10:51:00 +00:00
Michael	a419bbe7c7	Hypolite is right (not always, but in this case)	2017-03-25 10:11:02 +00:00
Michael	5060300138	Reset the static variable $baseurl	2017-03-25 10:07:45 +00:00
Hypolite Petovan	29fb28de43	Remove Embedly integration - Remove admin setting input	2017-03-25 01:57:19 -04:00
Hypolite Petovan	b9f4a6e4f0	Code cleanup + standards	2017-03-25 01:54:16 -04:00
Roland Haeder	d45e79dfe9	Continued: - converted multiple single-line comments into one multi-line comment (please stop abusing programming languages!) - added more TODO tags for type-hints (upcoming rewrite) - opps, one space was only fixed in develop branch, not in this PR branch Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 20:39:00 +01:00
Michael	b7242c3fa0	poco_last_updated is optimized	2017-03-23 22:56:22 +00:00
Roland Haeder	db1c2e4041	fixed comment and explained one Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 23:37:58 +01:00
Roland Haeder	e4ad359f5a	added curely braces + TODO for maybe avoiding multi-lined if() blocks as it confuses #3254 Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:53:03 +01:00
Roland Haeder	f94a10bf00	old behaviour restored Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:49:34 +01:00
Roland Haeder	66366b2804	added more spaces and curely braces killed ?> as it is discouraged Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:46:25 +01:00
Roland Haeder	d8eee2be55	added curely branches + reverted back to old behaviour (may come back one day) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:33:57 +01:00
Roland Haeder	09ab141404	better comment added by @Hypolite Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:29:26 +01:00
Roland Haeder	dad6a61be4	it is space-season ... ;-) #3254 Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:19:25 +01:00
Michael	2ce5ab1467	removed commented out line	2017-03-23 07:36:22 +00:00
Michael	5b6215d7bd	Better server_url handling	2017-03-23 07:34:45 +00:00
Michael	c25af197c9	baseurl should now be set correctly at all the time.	2017-03-23 07:10:22 +00:00
Michael	26ec56dfa5	server_url was forgotten	2017-03-23 06:45:00 +00:00
Michael	9e5bec1bc8	"poco_check" is now replaced and removed	2017-03-23 06:23:23 +00:00
Michael	8e240a1e8c	New function to validate gcontact array data	2017-03-22 23:13:32 +00:00
Michael	1d6910277d	Remove more deprecated "poco_check" calls	2017-03-22 07:11:58 +00:00
Michael	bc517ef3d2	Remove reduncancies	2017-03-22 05:26:44 +00:00
Michael	a376f55c1f	Linefeed added	2017-03-21 22:06:57 +00:00
Roland Häder	ddb5a8ea78	Continued: - added missing space/curly braces - added TODOs for later adding a lot type-hints, without these (and they are long time around in PHP) anything can be handled over to the method/function. Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-21 21:51:22 +01:00
Roland Häder	830af774d3	added more curly braces + a bit more usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-21 21:50:45 +01:00
Michael Vogel	4ebebe96fe	Merge branch 'develop' into 1703-worker-splitting	2017-03-21 17:08:07 +01:00
Hypolite Petovan	7b352f3f74	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
Michael Vogel	5a6da8b447	Merge branch 'develop' into 1703-worker-splitting	2017-03-21 16:38:59 +01:00
Michael	f7b0c2082b	Some standards	2017-03-21 15:24:49 +00:00
Michael	9c16b47f55	Strange comment removed	2017-03-21 15:15:58 +00:00
Hypolite Petovan	9c2c483996	Merge pull request #3112 from Quix0r/rewrites/coding-convention Coding convention applied - part 1	2017-03-21 10:19:53 -04:00
Michael	19825eddf7	Changed probing call. Removed dupolicated code.	2017-03-21 13:43:53 +00:00
Michael	be9db7f060	Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting	2017-03-21 07:59:14 +00:00
Michael	74cc5ade0c	Worker processes are split into many more separate tasks	2017-03-21 07:57:09 +00:00
Tobias Diekershoff	0fd874a683	Merge pull request #3246 from annando/1701-poco Split poco discovery in smaller function calls	2017-03-21 07:27:10 +01:00
Roland Haeder	09851331a9	Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-20 20:51:32 +01:00
rabuzarus	0879b46125	add NULL_DATE & coding standard work	2017-03-20 16:59:21 +01:00
rabuzarus	0060e2449e	Merge develop into 20170316_-_fix_event_edit Conflicts: mod/events.php	2017-03-20 16:46:36 +01:00
Michael	b42a977894	Bugfix for issue 3242 - forgotten "use"	2017-03-19 22:58:35 +00:00
Michael	41ee4ec60a	Standards and just some more poco slitting	2017-03-19 21:32:11 +00:00
Michael	e684fff477	Added documention	2017-03-19 18:24:49 +00:00
Michael	2615d40d6b	Split the POCO discovery process in several small processes	2017-03-19 17:43:59 +00:00
Michael	7f61b2ee15	Merge remote-tracking branch 'upstream/develop' into 1701-poco Conflicts: include/socgraph.php	2017-03-19 15:36:41 +00:00
Hypolite Petovan	65f809f5cb	Merge pull request #3245 from annando/issue-3242 Issue 3242: Define a maintenance reason	2017-03-19 11:06:25 -04:00
Michael	e93825b9f0	Some more standards	2017-03-19 14:43:24 +00:00
Michael	8dd732a896	Issue 3242: Define a maintenance reason	2017-03-19 13:24:07 +00:00
Michael	b06d787130	Merge remote-tracking branch 'upstream/develop' into 1702-null-date	2017-03-19 08:06:02 +00:00
Michael	132688d663	Standards, what else?	2017-03-19 08:04:04 +00:00
Michael	e9b083d13d	You shoudln't use a text variable like an array.	2017-03-19 01:23:34 +01:00
Roland Haeder	5e1c303c08	added spaces according to coding-convention Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 01:04:30 +01:00
Roland Haeder	1946cf143d	added logger ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 01:00:35 +01:00
Roland Haeder	621a77b275	added spaces around + curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 00:58:46 +01:00
Roland Haeder	6ca6c6813a	better log here ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 00:56:58 +01:00
Roland Häder	aeaafb5d71	Continued: - added curly braces - added TODO - removed TODO (no change needed, is fine) Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:37 +01:00
Roland Häder	4fe5cdf3fd	don't quit silently, at least a TODO is now around Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:37 +01:00
Roland Häder	e8e51d8535	Missed a 't', thanks to @annando Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:37 +01:00
Roland Häder	fbd559a823	more spaces + some curly spaces added Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:24 +01:00
Roland Häder	ed0d858f98	added spaces + some curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:24 +01:00
Roland Häder	4c72cb3584	Continued: - added missing spaces/curly braces - some more usage of dbm::is_result() - 2 oppsite if() statements can be mored to else - added more TODOs for type-hinting Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	bf0a07b7ae	Continued: - added missing space/curly braces - added TODOs for later adding a lot type-hints, without these (and they are long time around in PHP) anything can be handled over to the method/function. Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	015561fec6	Opps ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	4a96c280d0	added more curly braces + a bit more usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	d9c22c7f3e	Continued a bit: - converted some else if to elseif (only PHP) - converted some space -> tab (intending) Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	951006dd10	more spaces + some curly spaces added Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:51:54 +01:00
Roland Häder	41a36606c6	added spaces + some curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:50:19 +01:00
Roland Häder	cc83e9d72a	fixed curly brace (opps) Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +01:00
Roland Häder	6a3dc8b286	added more curly braces + fixed one Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +01:00
Roland Häder	3ad0fd442e	Continued: - added missing spaces/curly braces - some more usage of dbm::is_result() - 2 oppsite if() statements can be mored to else - added more TODOs for type-hinting Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +01:00
Roland Häder	c6ef84a964	Continued: - added missing space/curly braces - added TODOs for later adding a lot type-hints, without these (and they are long time around in PHP) anything can be handled over to the method/function. Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +01:00
Roland Häder	6a171a96aa	Opps ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:47 +01:00
Roland Häder	3849e7c9ff	added more curly braces + a bit more usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:47 +01:00
Roland Häder	92901d8626	more curly braces added + dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:21 +01:00
Michael	fb5f1f61fc	You shoudln't use a text variable like an array.	2017-03-18 23:32:59 +00:00
Michael	1a436264cd	Some standards	2017-03-18 12:13:43 +00:00
Michael	222550e784	From now on we are using 0001-01-01 as lowest date	2017-03-18 11:42:54 +00:00
Michael	62ccb4499a	Some more unneeded changes reverted	2017-03-18 08:54:25 +00:00
Michael	a2a171af06	"dob" is not a date field, so the changes are reverted	2017-03-18 08:50:27 +00:00
Michael	e301fa0832	Merge remote-tracking branch 'upstream/develop' into 1702-null-date	2017-03-18 08:31:43 +00:00
rabuzarus	497df57ef7	more standards work	2017-03-18 04:41:54 +01:00
Michael	f3bcf63d46	Standards and some logging improvements	2017-03-17 19:25:01 +00:00
rabuzarus	c785eb29c6	more work on standards compliance	2017-03-17 17:57:57 +01:00
Michael	87771cf617	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server Conflicts: include/discover_poco.php	2017-03-17 15:53:19 +00:00
rabuzarus	3cef98caf6	Merge pull request #3226 from annando/1702-only-worker The worker is now the only background processing system	2017-03-17 13:22:23 +01:00
Michael	24a57020b9	Better version transformation for nodeinfo and statistics.json	2017-03-16 21:34:53 +00:00
rabuzarus	8ae8465d48	add dop event & fix event edit	2017-03-16 20:15:25 +01:00
Michael	58bf1c50af	Bugfix: When a query fails we mustn't use the result value.	2017-03-16 09:23:12 +00:00
Michael	4812f4c0f9	Without only the worker queue we don't need the deliverq anymore.	2017-03-16 07:30:59 +00:00
Michael	a211c8cb77	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-16 05:51:22 +00:00
rabuzarus	6fdc219143	Merge pull request #3227 from annando/1703-pdo We now support PDO	2017-03-16 00:25:16 +01:00
Michael	8e12b159d9	Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup	2017-03-15 14:37:30 +00:00
Michael	9f9497f2ca	Merge remote-tracking branch 'upstream/develop' into 1701-poco	2017-03-15 14:34:09 +00:00
Michael	88a69b93d5	Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server	2017-03-15 13:56:17 +00:00
Michael	8decd15565	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-15 13:55:43 +00:00
Michael	dc3fcf0487	Standard stuff	2017-03-15 06:00:22 +00:00
Michael	35ec1c8f26	Bugfix for pull request 3216 - feed items were mixed	2017-03-14 21:14:09 +00:00
Michael Vogel	e57bd5fe55	Merge pull request #3233 from rabuzarus/20170314_-_pagination limit pagination page buttons to max 10	2017-03-14 20:05:29 +01:00
rabuzarus	0143369e54	limit pagination page buttons to max 10	2017-03-14 18:31:03 +01:00
Michael Vogel	a7e8e86800	Merge pull request #3221 from strk/remember-openid Fix "remember me" cookie for OpenID logins	2017-03-14 16:30:15 +01:00
Michael	0d32f0be46	One forgotten standard	2017-03-14 15:18:56 +00:00
Michael	f73389dd12	Standard stuff	2017-03-14 15:17:21 +00:00
fabrixxm	fa3490ba5b	Merge pull request #3224 from annando/1702-no-old_pager The old pager is now removed	2017-03-14 10:29:03 +01:00
Michael	43ceb72196	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-14 07:26:15 +00:00
Michael Vogel	199bba20d9	Merge pull request #3200 from Hypolite/issue/#3195 Improve pagination on frio	2017-03-14 06:05:42 +01:00
Michael	748caa0807	Removed debug output	2017-03-14 04:58:05 +00:00
Michael	a2b7b2a968	Daily updating the server status	2017-03-13 22:16:09 +00:00
Sandro Santilli	0b46a5f935	Standards: add braces (thanks @Hypolite)	2017-03-13 23:09:09 +01:00
Sandro Santilli	8517ba1fab	Remove extra space after open parentheses	2017-03-13 23:08:03 +01:00
Michael Vogel	98945eb6fa	Merge pull request #3213 from Hypolite/issue/#2792-2 Like behavior fix/improvements	2017-03-13 18:35:32 +01:00
Michael	ae64f6f7e2	z_fetch_url now always returns an array	2017-03-13 14:37:51 +00:00
Sandro Santilli	cbaf196f50	Only remove the "remember me" cookie at submitting the auth form Fixes loss of remember (Friendica) cookie on switching Managed accounts	2017-03-13 11:59:05 +01:00
Michael	fbb84ee219	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-13 10:18:29 +00:00
Michael	6a16565642	Merge remote-tracking branch 'upstream/develop' into 1701-poco	2017-03-13 07:23:32 +00:00
Michael	44888590e5	One error, one documentation, one brace	2017-03-13 06:32:33 +00:00
Michael	acadb8ecdb	Remove redundancies.	2017-03-13 06:09:00 +00:00
Michael	eb6a6228f7	more spaces	2017-03-13 05:57:37 +00:00
Michael	80e58964ce	Standard stuff	2017-03-13 00:09:32 +00:00
Michael	97d3176754	Querying via nodeinfo	2017-03-13 00:03:27 +00:00
Michael	49b22de705	Changes from previous pull request applied again	2017-03-12 21:57:09 +00:00
Michael	e10339a47f	Merge remote-tracking branch 'upstream/develop' into 1703-pdo	2017-03-12 21:05:10 +00:00
Michael	77e8c44016	Merge remote-tracking branch 'upstream/develop' into 1702-only-worker Conflicts: include/onepoll.php include/queue.php	2017-03-12 21:03:44 +00:00
Michael	1624150db4	Merge remote-tracking branch 'upstream/develop' into 1702-null-date Conflicts: include/onepoll.php	2017-03-12 20:54:28 +00:00
Michael	259598e569	Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share	2017-03-12 20:52:48 +00:00
Michael	044e9a6603	Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager Conflicts: mod/profile.php	2017-03-12 20:52:14 +00:00
Michael	18d23ca443	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-12 20:49:48 +00:00
Tobias Diekershoff	7d1e54664a	Merge pull request #3133 from mexon/mat/cidfix Allow cid URLs for images	2017-03-12 15:44:22 +01:00
Tobias Diekershoff	7275319eb6	Merge pull request #3214 from Hypolite/get_contact-rewrite Reformatted get_contact()	2017-03-12 15:42:17 +01:00
Tobias Diekershoff	1bf089e424	Merge pull request #3216 from annando/1701-performance Better network handling, improved structure	2017-03-12 15:40:56 +01:00
Tobias Diekershoff	e29d7f19d1	Merge pull request #3222 from Hypolite/issue/#3220 Diaspora: Normalize line endings instead of adding <br> before Markdown()	2017-03-12 15:35:42 +01:00
Michael	bfad58a777	We don't need to show the id.	2017-03-12 09:41:10 +00:00
Michael	3a3fa017a6	Discovery of new servers	2017-03-12 09:13:04 +00:00
Hypolite Petovan	2310bf994a	Normalize line endings instead of adding <br> before Markdown()	2017-03-12 03:55:22 -04:00
Sandro Santilli	df6304cc42	Fix "remember me" cookie for OpenID logins Closes #2432 NOTE: in order to obtain the same "cookie hash" it was required to include unneeded fields in the user record structure, this would be good to change in the future...	2017-03-12 01:11:35 +01:00
Michael	2d2a35af73	Make Hypolite happy	2017-03-08 18:03:41 +00:00
Michael	32f1b2de20	Forgotten debug output	2017-03-08 13:15:24 +00:00
Michael	d898616f8d	Remove junk from the version number	2017-03-08 05:40:57 +00:00
Hypolite Petovan	37b15995d8	Add pump.io network to probing supported networks - Remove useless condition	2017-03-07 16:43:22 -05:00
Hypolite Petovan	d7f62e82b9	Fix behavior regression Reverted quitting get_contact if Probe::uri didn’t yield an url for “nick@server.tld” form.	2017-03-07 16:28:15 -05:00
Michael	f7f23038db	Merge remote-tracking branch 'upstream/develop' into 1701-performance	2017-03-07 21:24:20 +00:00
Michael	f09a8609df	Better separation between queries with or without result	2017-03-07 17:16:17 +00:00
Hypolite Petovan	97378893cd	Switch nurl and addr lookups - nurl lookup is more frequent than addr lookup, saves queries	2017-03-06 16:26:04 -05:00
Hypolite Petovan	89f0b85905	Split slow catch-all query into three fast queries Thanks @annando for the tip.	2017-03-06 16:19:12 -05:00
Hypolite Petovan	116b9e1c1f	Use Probe::uri instead of probe_url() - Moved file inclusion to enable lazy loading	2017-03-06 06:01:08 -05:00

... 12 13 14 15 16 ...

6231 commits