21262 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	904fee3bed	Merge pull request #5876 from nupplaphil/friendica-5875 ... Uncaught Error for getCurlCode()	2018-10-10 12:18:11 -04:00
Philipp Holzer	e6b1f9ef09	friendica-5875 Uncaught Error: Call to undefined method Friendica\App::getCurlCode() fixed	2018-10-10 18:10:38 +02:00
Hypolite Petovan	b833930702	Merge pull request #5862 from nupplaphil/rename_App_Methods ... Rename app methods	2018-10-10 08:17:39 -04:00
Philipp Holzer	97dc4bba1a	some more renamings & doku	2018-10-10 09:16:06 +02:00
Philipp Holzer	3d04562c87	some more renamings & doku	2018-10-10 08:54:18 +02:00
Philipp Holzer	307286fc47	parameters and getURLpath to getURLPath	2018-10-10 01:18:47 +02:00
Philipp Holzer	3eb4332f33	Bugfixing Backend	2018-10-10 01:16:51 +02:00
Philipp Holzer	8cc15fd2a8	Bugfixing DatabaseTest	2018-10-10 00:20:08 +02:00
Philipp Holzer	5a02e39a65	Rename App Methods ... - renamed a lot of App methods to CamelCase - replaced direct public variables with get-/set-Methods	2018-10-10 00:16:06 +02:00
Hypolite Petovan	5f9dd11cfb	Merge pull request #5867 from annando/ap-fix-follow ... AP: Switchting existing contacts to AP when receiving activities	2018-10-09 16:08:38 -04:00
Hypolite Petovan	c9f1857c4a	Merge pull request #5866 from annando/ap-cleanup ... AP: Avoid a misleading log entry / unneeded field removed	2018-10-09 16:06:58 -04:00
Michael	0994aaf875	AP: Avoid a misleading log entry / unneeded field removed	2018-10-09 20:00:57 +00:00
Michael	c0f26ace2e	AP: Switchting existing contacts to AP when receiving activities	2018-10-09 19:58:15 +00:00
Hypolite Petovan	83dca0018d	Merge pull request #5865 from JonnyTischbein/issue_wrong_login_return ... Fix Login return with pop-up menu form	2018-10-09 15:50:43 -04:00
Jonny Tischbein	2db2b79bfa	Give Login Form previous URL to return to. SESSION var is empty if invalid page. empty args is catched by function	2018-10-09 21:38:17 +02:00
Hypolite Petovan	b73dea95a4	Merge pull request #5864 from friendica/revert-5860-issue_comment_wrap ... Revert "Word Wrap for long words in comments"	2018-10-09 15:25:18 -04:00
Hypolite Petovan	903290a764	Revert "Word Wrap for long words in comments"	2018-10-09 15:09:51 -04:00
Hypolite Petovan	257beec485	Merge pull request #5861 from JonnyTischbein/issue_return_url ... Replace goaway location SESSION var return_url with page as string value	2018-10-09 14:46:14 -04:00
Jonny Tischbein	29033bdf05	goaway to network if deleted item + remove goaway for filerm	2018-10-09 20:44:30 +02:00
Jonny Tischbein	d18421f760	Return to item if not owned by user or canceld	2018-10-09 20:40:25 +02:00
Jonny Tischbein	d8780b1640	Replace goaway location SESSION var return_url with page as string value	2018-10-09 20:10:34 +02:00
Hypolite Petovan	23be68e74d	Merge pull request #5860 from JonnyTischbein/issue_comment_wrap ... [frio] Word Wrap for long words in comments	2018-10-09 11:17:11 -04:00
Jonny Tischbein	c0fc3c9845	frio set working css property + adding fix for vier	2018-10-09 17:12:28 +02:00
Jonny Tischbein	05d27e48aa	word-wrap for comments in frio style.css	2018-10-09 16:47:28 +02:00
Tobias Diekershoff	9305821b9d	Merge pull request #5856 from annando/ap-fixes ... AP fixes: LD-signature, wrong owner for completed threads, account removal	2018-10-09 07:13:49 +02:00
Michael	d5bc14c28d	Merge remote-tracking branch 'upstream/develop' into ap-fixes	2018-10-09 05:06:20 +00:00
Michael	b5d73f840c	AP fixes: LD-signature, wrong owner for completed thres, account removal	2018-10-09 05:04:24 +00:00
Hypolite Petovan	4472cf2289	Merge pull request #5855 from annando/ap-avatar ... AP: Avoid an empty avatar field	2018-10-08 00:06:41 -04:00
Michael	4047952703	AP: Avoid an empty avatar field	2018-10-08 03:28:49 +00:00
Hypolite Petovan	3bccaccede	Merge pull request #5848 from nupplaphil/friendica-5847 ... friendica-5847 Console Cache List command doesn't work	2018-10-07 17:47:51 -04:00
Hypolite Petovan	28b4fdb1c3	Merge pull request #5854 from annando/ap-parser ... We now parse a compacted JSON	2018-10-07 17:42:03 -04:00
Michael	30ad6d60fd	Duplicated line removed	2018-10-07 20:51:39 +00:00
Michael	46f77f3486	Detect the object type	2018-10-07 20:36:15 +00:00
Philipp Holzer	7da6da6666	Bugfixings for getAllKeys()	2018-10-07 22:14:05 +02:00
Michael	93866b477a	Several fixes	2018-10-07 19:42:04 +00:00
Michael	bd6ba98e8d	Some more cleanup	2018-10-07 18:41:45 +00:00
Michael	1efca1b75d	owner is now actor	2018-10-07 17:35:43 +00:00
Michael	616c4a89bd	The new parsing is now active	2018-10-07 17:17:06 +00:00
Hypolite Petovan	ebe87bb16d	Merge pull request #5853 from JonnyTischbein/issue_login_redirect-fixed ... Return to previous page after login	2018-10-07 11:59:17 -04:00
Michael	36c31e4091	Switching to parsing the JSON-LD	2018-10-07 15:34:51 +00:00
Jonny Tischbein	28456de249	Save return_url before login. Add login mask to many sites if not logged in.	2018-10-07 16:34:08 +02:00
Michael	3a74f3364d	Switch to parsing compacted JSON data	2018-10-07 13:37:05 +00:00
Hypolite Petovan	772d735f12	Merge pull request #5845 from annando/ap-suggest ... Preparation for suggestions under AP	2018-10-07 08:58:21 -04:00
Philipp Holzer	8491f8660f	Bugfixing Memcached	2018-10-07 10:38:45 +02:00
Philipp Holzer	1ec5c6b284	friendica-5847 Console Cache List command doesn't work ... - filterPrefix => filterArrayKeysByPrefix() - Logging failed Executions of getAllKeys and get from Memcached	2018-10-07 10:35:37 +02:00
Hypolite Petovan	571e37f4d4	Merge pull request #5844 from nupplaphil/mode_followup ... Changing Friendica\App\Mode from static methods to public methods	2018-10-06 22:38:54 -04:00
Philipp Holzer	3f0f3b6ae6	friendica-5847 Console Cache List command doesn't work ... - Added $prefix to all CacheDriver - Moved hostname magic to CacheDriver - Added test for getAllKeys()	2018-10-07 00:27:54 +02:00
Michael	f8b74033a4	Avoid a notice	2018-10-06 18:44:42 +00:00
Michael	192c6c8d4f	Preparation for suggestions under AP	2018-10-06 18:42:26 +00:00
Philipp Holzer	a2fb49a2b4	Removing debugging echo ... Updating Tests	2018-10-06 19:11:00 +02:00