friendica

Author	SHA1	Message	Date
Hypolite Petovan	23e38cd559	Revert "Updated hcard with the new feed links" This reverts commit `cc84939658`.	2018-01-01 17:29:50 -05:00
Hypolite Petovan	eb1b6605b7	Remove include/oembed and mod/oembed	2017-12-31 20:58:32 -05:00
Adam Magness	db653e4451	Move salmonKey to Salmon class move the salmonKey function from Crypto to Salmon	2017-12-31 08:04:36 -05:00
Adam Magness	9e6bf79380	Crypto to src move Crypto to src and Friendica\Util namespace	2017-12-30 11:51:49 -05:00
Hypolite Petovan	cc84939658	Updated hcard with the new feed links	2017-12-30 00:40:21 -05:00
Hypolite Petovan	a75a27e08f	Add Feed module - Update profile alternate links	2017-12-30 00:32:45 -05:00
Hypolite Petovan	c2e29f2685	Add type parameter to OStatus::feed - Removed unused parameter $a - Added $nocache parameter - Updated usages	2017-12-30 00:19:16 -05:00
Hypolite Petovan	095d458de4	Fix formatting mod/profile	2017-12-29 22:23:58 -05:00
Hypolite Petovan	19878a6397	Fix formatting dfrn_poll	2017-12-29 22:12:18 -05:00
Hypolite Petovan	c238154a6e	Move include/auth to Login::sessionAuth - Remove include/auth	2017-12-29 21:55:13 -05:00
Hypolite Petovan	2dc598ed5b	Move login() to Login module - Move nuke_session to include/security - Remove mod/login	2017-12-29 21:55:13 -05:00
Hypolite Petovan	2cfcf433a3	Fix formatting in mod - mod/api - mod/bookmarklet - mod/dfrn_request	2017-12-29 21:55:13 -05:00
Hypolite Petovan	1724dd3841	Make validate_url more intuitive - Remove the parameter passed by reference - Add modified url in return value	2017-12-29 21:55:13 -05:00
Hypolite Petovan	e16852c2f5	Replace init_groups_visitor with Group::getIdsByContactId	2017-12-29 21:55:12 -05:00
Michael	69d16d9cfa	Don't show the connect link in the profile on the "follow" page	2017-12-29 22:53:08 +00:00
Michael	319e21f6e3	Added explanation	2017-12-29 12:47:56 +00:00
Michael	c7bcc13451	Reformatted file, improved coding for "twist"	2017-12-28 20:37:23 +00:00
Michael	d7039c6862	Merge remote-tracking branch 'upstream/develop' into comment-public	2017-12-27 15:51:36 +00:00
Michael	d0a43b8533	Missing include	2017-12-27 15:26:17 +00:00
Michael	d707c5afcd	Merge remote-tracking branch 'upstream/develop' into comment-public	2017-12-26 23:59:32 +00:00
Tobias Diekershoff	3873d4863f	add Socialhome to the federation stats	2017-12-24 16:08:34 +01:00
Michael	5afedb28d4	You can now comment on the community page	2017-12-23 07:33:51 +00:00
Michael	2e022733f6	Standards	2017-12-21 22:54:58 +00:00
Michael	4dcf14f62e	Query was simplified	2017-12-21 18:49:27 +00:00
Michael	cfa42552bc	Standards	2017-12-21 18:46:35 +00:00
Michael	fba40b8761	Removed unneeded code	2017-12-21 08:58:36 +00:00
Michael	f7272be4a8	Reshares are now working	2017-12-20 18:18:25 +00:00
Michael	343f22e02f	Updating after post does now work	2017-12-20 10:16:25 +00:00
Michael	fa8a09d977	Comments to public posts no get through	2017-12-19 23:12:37 +00:00
Michael	b457ed6876	Preparation for being able to comment every public item	2017-12-19 17:15:56 +00:00
Michael	2b50f001b9	Added statistics	2017-12-19 07:39:21 +00:00
Hypolite Petovan	179b311978	Remove group_member.uid - Use contact.uid alternatively - Use JOIN with group table	2017-12-14 22:47:58 -05:00
Michael	2d7cd2daf4	"update" is enough	2017-12-14 22:18:53 +00:00
Michael	cf56de1e77	Merge remote-tracking branch 'upstream/develop' into dbstructure-class	2017-12-14 21:42:26 +00:00
Michael	15d42de647	Class moved, changes applied	2017-12-14 21:13:02 +00:00
Michael	89ad41aca5	Bugfix: Calls to a renamed function had been changed	2017-12-14 18:06:48 +00:00
Michael	ea10a7c002	Map is moved to the new place	2017-12-13 21:37:34 +00:00
Hypolite Petovan	6362296666	Add INNER JOIN to admin pending user list please @annando	2017-12-13 10:32:59 -05:00
Hypolite Petovan	4d72a40aa6	Add Exception support to User::create usages	2017-12-12 21:13:36 -05:00
Hypolite Petovan	9063c830f5	Fix admin pending user list SQL	2017-12-12 21:07:22 -05:00
Hypolite Petovan	ac3642e76f	Add Exceptions to User::create	2017-12-12 20:43:21 -05:00
Michael	88ef61df95	Removed useless "function_exists" checks	2017-12-12 04:52:33 +00:00
Hypolite Petovan	4fe8dab08d	Remove include/group.php	2017-12-09 13:45:54 -05:00
Hypolite Petovan	abdecd2b2f	Use new Model methods for groups	2017-12-09 13:45:17 -05:00
Hypolite Petovan	fe89e7760e	Fix formatting all around	2017-12-09 13:42:02 -05:00
Hypolite Petovan	e44abb6c2a	Fix formatting of mod/register	2017-12-08 19:26:48 -05:00
Hypolite Petovan	bc58e8d3be	Rename Model\GlobalContact to Model\GContact	2017-12-07 23:57:56 -05:00
Hypolite Petovan	a42595a30c	Move Object\Contact to Model\Contact	2017-12-07 23:56:12 -05:00
Hypolite Petovan	6b60b89385	Move Object\Profile to Model\Profile	2017-12-07 23:55:05 -05:00
Hypolite Petovan	3fc3e67b70	Separate Object\Photo into Model\Photo and Object\Image - Renamed a bunch of functions to shorter or clearer names	2017-12-07 23:54:51 -05:00
Michael Vogel	5747cfc79c	Revert "Move Objects to Model"	2017-12-08 05:21:51 +01:00
Michael Vogel	e437c74d0e	Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model Move Objects to Model	2017-12-08 05:02:21 +01:00
Hypolite Petovan	cf45e8738c	Hotfix regmod missing use statement	2017-12-07 14:12:03 -05:00
Hypolite Petovan	cd84bf8963	Rename Model\GlobalContact to Model\GContact	2017-12-07 09:09:28 -05:00
Hypolite Petovan	18d93cddf6	Move Object\Contact to Model\Contact	2017-12-07 09:04:24 -05:00
Hypolite Petovan	d4ca30a6db	Move Object\Profile to Model\Profile	2017-12-07 08:57:35 -05:00
Hypolite Petovan	52bddd580c	Separate Object\Photo into Model\Photo and Object\Image - Renamed a bunch of functions to shorter or clearer names	2017-12-07 08:56:11 -05:00
Adam Magness	3772a1c24c	Remove mod files remove mod files based on lack of usage/obseleteness.	2017-12-06 16:45:41 -05:00
Tobias Diekershoff	c258df0f0a	removed x-permission	2017-12-05 07:13:55 +01:00
Adam Magness	b1d16fbdf7	Update use statements update use statements for rename to singular.	2017-12-04 09:04:36 -05:00
Adam Magness	6e5471def3	Rename to singular Rename and update references. Standards and a require_once.	2017-12-04 09:01:27 -05:00
Adam Magness	2f0da29c75	Features to src Move Features to class in Friendica\Content namespace. Update function calls and references.	2017-12-04 08:33:49 -05:00
Hypolite Petovan	27212c7f39	Update function calls to use Model\User and Object\Contact	2017-12-03 22:29:06 -05:00
Hypolite Petovan	4395c20679	Fix formatting and add documentation - mod/register - mod/regmod - Model/User - Worker/CronJobs	2017-12-03 22:15:31 -05:00
Michael Vogel	ae1227c9ca	Merge pull request #4001 from MrPetovan/bug/3999-fix-password-change Fix password change	2017-12-03 14:49:10 +01:00
Hypolite Petovan	1eb8355ac8	Fix wrong condition Grmbl	2017-12-03 08:37:01 -05:00
Hypolite Petovan	3359f3f5c7	Fix formatting in mod/settings	2017-12-03 08:36:39 -05:00
Michael	df89e0384d	Added description to networks, renaming some network names	2017-12-03 13:26:52 +00:00
Tobias Diekershoff	ffd04fed85	missing word	2017-12-03 10:26:26 +01:00
Michael	6f7510550d	NETWORK_MAIL2 was never finished, so remove it as well	2017-12-03 09:19:58 +00:00
Tobias Diekershoff	2aca406f52	wrong URL in directory	2017-12-03 08:27:15 +01:00
Michael	adf802474b	Zot was never really supported, so it is now removed completely	2017-12-02 21:57:39 +00:00
Michael Vogel	2ca03acb45	Merge pull request #3986 from MrPetovan/task/admin-block-list Admin remote contact block list	2017-12-02 22:09:04 +01:00
Adam Magness	2b121779a6	Salmon move to src Salmon class, update function name and function calls. Some standards as well.	2017-12-02 09:32:45 -05:00
Hypolite Petovan	4d10f3b3b7	Remove unused use statement	2017-12-02 08:42:44 -05:00
Hypolite Petovan	75181322ba	Improve page contacblock for frio theme	2017-12-01 22:33:04 -05:00
Hypolite Petovan	8826ece55e	Use Contact::getIdForURL instead of probing - Add change to mod/admin - Add change to util/global_community_block	2017-12-01 22:32:24 -05:00
Hypolite Petovan	843ec842c3	Merge branch 'develop' into task/admin-block-list	2017-12-01 21:39:20 -05:00
Adam Magness	9a4e741d1a	Review Changes renamed some functions and adjusted corresponding calls.	2017-12-01 21:05:06 -05:00
Adam Magness	e90b0748aa	Code Cleanup Standards clean up	2017-12-01 18:13:39 -05:00
Adam Magness	f21feb975d	Require Cleanup Remove instances of require_once for email.php	2017-12-01 14:57:13 -05:00
Adam Magness	6008e3df11	Email to src Create Email class and update/rename functions and function calls.	2017-12-01 14:41:27 -05:00
Hypolite Petovan	58ac3532b7	Fix undefined variables messages	2017-12-01 08:32:21 -05:00
Hypolite Petovan	ff459441cf	Merge branch 'develop' into task/admin-block-list	2017-12-01 00:48:13 -05:00
Hypolite Petovan	dc09319695	Add admin/contactblock page - Add page template	2017-12-01 00:43:39 -05:00
Hypolite Petovan	16d0c30328	Move admin templates to dedicated sub-folder	2017-12-01 00:40:55 -05:00
Hypolite Petovan	0ae6f571da	Merge pull request #3982 from zeroadam/Photo-#3878 Photo to src	2017-11-30 20:33:48 -05:00
Hypolite Petovan	3cebdee867	Fix mod/admin.php formatting	2017-11-29 20:28:30 -05:00
Adam Magness	0373056448	Review and Use statements use statements and review changes.	2017-11-29 17:29:11 -05:00
Michael	fe348acb49	Small fixes to "nogroup"	2017-11-29 20:59:06 +00:00
Adam Magness	0091d318e5	Function names Update function names and corresponding function calls	2017-11-29 12:17:12 -05:00
Adam Magness	54827e7fed	Photo to src Move Photo to Friendica\Object namespace and replace require_once statments with use statements.	2017-11-29 07:52:27 -05:00
Michael	8bffee43b3	Threads are now always enabled.	2017-11-28 18:54:39 +00:00
Michael Vogel	3f448d9a42	Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate Migrate password hashing Part 1: Add User::authenticate	2017-11-27 15:14:36 +01:00
Michael	9612496e9e	The function "template_escape" doesn't exist anymore.	2017-11-27 06:44:49 +00:00
Michael	a6de1a1ae8	Posting images to public forums now really does work.	2017-11-26 22:28:46 +00:00
Hypolite Petovan	2196a0577b	Remove unused upubkey and uprvkey from queries - Switched queries to new dba::* functions	2017-11-26 14:55:47 -05:00
Hypolite Petovan	ec6f5193e2	Switch to User::authenticate - Removed hash('whirlpool') to check password	2017-11-26 14:46:08 -05:00
Hypolite Petovan	90a8ae2cb8	Fix formatting - include/auth.php - include/oauth.php - include/user.php - mod/removeme.php - src/Worker/Queue.php	2017-11-26 14:18:45 -05:00
Michael	661f9af93a	Network page: Selecting a forum overrides the group selection	2017-11-26 16:17:32 +00:00
Hypolite Petovan	3fbf2e3bcf	Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud A tag cloud widget for the profile page	2017-11-26 11:16:14 -05:00
Michael	f059b33390	Avoid empty user export when there are UTF8 problems	2017-11-26 13:58:24 +00:00
Hypolite Petovan	068d3dc746	Merge pull request #3959 from annando/image-forum Images that are uploaded to public forums are now public	2017-11-25 21:40:33 -05:00
Michael	cb7648359c	When we are requesting a conneczion, the contactis no longer "blocked"	2017-11-26 02:31:26 +00:00
Michael	a7088f5b67	Images that are uploaded to public forums are now public	2017-11-26 02:03:59 +00:00
rabuzarus	4224209497	Merge develop into 20171122_-_port_tagcloud Conflicts: include/features.php	2017-11-25 23:41:20 +01:00
Michael	1adff81a25	Documentation for "fetch further information"	2017-11-25 14:43:28 +00:00
Michael	3cb906c420	Issue 3911: Fetch keywords for feeds	2017-11-25 11:59:20 +00:00
Adam Magness	609a4de5d0	src Standards This basically completes coding standards changes for the entire src directory, with the exception of App.php	2017-11-23 14:01:58 -05:00
rabuzarus	19afabd268	tags: possibility to filter posts for tags and profile owner (profile)	2017-11-23 00:59:20 +01:00
rabuzarus	d7d653aab6	port tag cloud widget from hubzilla	2017-11-22 21:29:07 +01:00
Adam Magness	7cee150868	ForumManager to src ForumManager moved to Friendica\Content namespace	2017-11-21 07:20:22 -05:00
Hypolite Petovan	33ad6b6d7e	Merge pull request #3927 from rabuzarus/20171121_-_fix_reg_notifs Bugfix: show no registrations notifs if there are none	2017-11-20 23:54:11 -05:00
rabuzarus	04a7291303	Bugfix: show no registrations notifs if there are none	2017-11-21 03:45:13 +01:00
Adam Magness	69fd3c60b0	Indentation fix errant indentation change	2017-11-20 19:03:58 -05:00
Adam Magness	1726ededac	Emailer to src Move emailer to src Friendica\Util namespace	2017-11-20 15:37:30 -05:00
Adam Magness	ddacbf2c13	XML class standards updated the xml class for PSR-2	2017-11-20 12:56:31 -05:00
Hypolite Petovan	b85c94a60d	Merge branch 'develop' into issue/3878-move-Contact-to-src	2017-11-19 18:09:14 -05:00
Hypolite Petovan	81647cefed	Merge pull request #3920 from annando/scripts The poller is now the worker and we have a "scripts" folder	2017-11-19 17:25:14 -05:00
Hypolite Petovan	898fe2db1e	Code cleanup - Remove extraneous use statements - Format require_once	2017-11-19 17:06:18 -05:00
Hypolite Petovan	5ee728972e	Remove include/Contact.php - Remove all mentions to include/Contact.php	2017-11-19 17:05:21 -05:00
Hypolite Petovan	ec02af593d	Change called method names - Add GlobalContact::getRandomUrl - Rename Contact::getIdForURL - Rename Diaspora::sendUnshare - Remove unused parameter $self in Contact::terminateFriendship	2017-11-19 17:03:39 -05:00
Hypolite Petovan	b92fc24ff0	Add Contact Object - Add Profile Object - Add User Model - Add use statements	2017-11-19 16:55:28 -05:00
Michael	920160cb28	The poller is now the worker	2017-11-19 21:47:21 +00:00
Adam Magness	a6d501bc4e	Overzealous rename reverted change to function name.	2017-11-19 16:14:16 -05:00
Adam Magness	d9e9cbe753	Coding Standards A few updates for coding standards	2017-11-19 15:32:54 -05:00
Michael	183999ee08	No german compound wording :-)	2017-11-19 19:47:04 +00:00
Michael	8cd21269ff	The last of the big workers moved ... delivery and notifier	2017-11-19 18:59:55 +00:00
Michael	2de457489f	"CreateShadowentry" and "ProfileUpdate" now moved as well	2017-11-19 16:59:37 +00:00
Hypolite Petovan	2336fa9d74	Add smart_threading user setting	2017-11-19 00:57:31 -05:00
Michael	1f28cbd2c6	And now DiscoverPoCo.php	2017-11-18 11:02:46 +00:00
Michael	01362461cf	poller.php is cleaned up, unneeded stuff has been removed	2017-11-18 11:01:01 +00:00
Michael	925d2d2383	Directory moved	2017-11-18 07:59:30 +00:00
Adam Magness	cd12de46f8	OStatus moved to src OStatus moved to Friendica\Protocol namespace. References and function calls updated. Related to #3878	2017-11-15 23:09:11 -05:00
Adam Magness	259f91caa9	PortableContact created Create PortableContact and remove socgraph, update references, and calls	2017-11-15 10:53:16 -05:00
Adam Magness	47db624105	GlobalContact created Moved DirSearch and GlobalContact related functions to Friendica\Model namespace	2017-11-15 09:47:49 -05:00
Michael	476facde61	Onepoll moved as well	2017-11-12 18:50:35 +00:00
Adam Magness	4d146acf90	Smilies to src Move Smilies to Friendica\Content namespace. Related to #3878	2017-11-11 07:21:15 -05:00
Hypolite Petovan	6b23548a2b	Merge pull request #3896 from tobiasd/20171110-community adding a global community disclaimer	2017-11-10 16:17:38 -05:00
Tobias Diekershoff	fd2b807292	halfe the double	2017-11-10 22:00:39 +01:00
Tobias Diekershoff	4f95b413fa	some corrections	2017-11-10 20:57:02 +01:00
Tobias Diekershoff	3e1d0bf7a8	move HTML to template and add an optional hint that a global community page shows all arriving public postings	2017-11-10 20:25:17 +01:00
Adam Magness	bc49fc974c	Capitalized XML Acronym classes should be capitalized	2017-11-10 07:45:33 -05:00
Adam Magness	f245bc8359	Move xml to namespace Relocate xml from include to src Related to #3878	2017-11-10 07:18:24 -05:00
Tobias Diekershoff	b8a76794e0	add info text about email on registration	2017-11-10 08:06:56 +01:00
Adam Magness	06c3af9b60	Move Cache to src relocate the cache class to Friendica\Core namespace	2017-11-09 11:05:18 -05:00
Hypolite Petovan	ee5b9de6ad	Reverting RINO crypto code to php-encryption version 1.2	2017-11-09 03:20:18 -05:00
Hypolite Petovan	1262d6bfee	Function name typo	2017-11-09 03:01:53 -05:00
Hypolite Petovan	918f2e8593	Fix another php-encryption version migration error	2017-11-09 03:01:02 -05:00
Hypolite Petovan	d5aff9ac31	Fix php-encryption version 2 compatibility issues	2017-11-09 02:35:11 -05:00
Hypolite Petovan	acd65aade1	Switch to new php-encryption library version - Remove references to library/ files - Add namespace to library classes	2017-11-09 02:21:37 -05:00
Adam Magness	4ca68c7af0	Class file relocations Issue #3878	2017-11-08 08:37:03 -05:00
Adam Magness	6189f6c8e7	Relocate class files from /include to /src/ dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.	2017-11-08 08:36:48 -05:00
Michael	063358301f	One space more	2017-11-08 13:08:26 +00:00
Michael	76caf7a9cf	Small corrections	2017-11-08 06:43:20 +00:00
Michael	76f73c7236	And some more places	2017-11-07 22:15:59 +00:00
Michael	5a6fa4ae87	Some more	2017-11-07 21:53:11 +00:00
Adam Magness	a782ab50f9	Correct deletion Bring back mod/probe.php and delete include/probe.php as intended.	2017-11-07 12:31:32 -05:00
Adam Magness	8522c47353	Remove Includes Removed references to include/config.php and include/probe.php and deleted the respective files.	2017-11-07 12:14:03 -05:00
Adam Magness	b995e858e6	Review changes Replacements for ::delete() as well as changes to include use statements.	2017-11-07 09:12:01 -05:00
Adam Magness	0dfa57948f	Issue-#3873 Replace deprecated functions with new syntax.	2017-11-07 06:24:39 -05:00
Michael Vogel	669dafcf22	Merge pull request #3876 from tobiasd/2017107-followup3874 add version info to notification text	2017-11-07 06:44:05 +01:00
Tobias Diekershoff	a49c1be7c9	add version info to notification text	2017-11-07 06:32:10 +01:00
Hypolite Petovan	c847a2f9cc	Merge pull request #3874 from tobiasd/20171009-checkversion check upstream version	2017-11-06 13:59:49 -05:00
Tobias Diekershoff	7881fd7dc9	std foo	2017-11-06 18:20:39 +01:00
Tobias Diekershoff	143e7fc6b7	dont use the entire url as option	2017-11-06 18:05:42 +01:00
Tobias Diekershoff	1f9b52f2bf	code corrections	2017-11-06 17:45:33 +01:00
Michael	930309d2ec	Merge remote-tracking branch 'upstream/develop' into worker-class	2017-11-05 17:23:53 +00:00
Hypolite Petovan	93fd189198	Merge pull request #3866 from annando/detailled_notif There is now a user switch to change between notification styles	2017-11-05 08:14:10 -05:00
Michael	478e363967	proc_run was replaced	2017-11-05 12:15:53 +00:00
Michael	da212a28a2	New worker class that does all the work	2017-11-05 10:33:46 +00:00
Tobias Diekershoff	0d0751fce3	comparison works now	2017-11-05 07:45:49 +01:00
Michael	9c78938ca9	Improved "if" construct	2017-11-04 21:27:32 +00:00
Michael	4831587250	Some explanation added	2017-11-04 14:00:29 +00:00
Michael	2894214347	Misspelled "detailed"	2017-11-04 12:08:12 +00:00
Michael	7de3eae8d0	There is now a user switch to change between condensed and detailled notifications	2017-11-04 12:01:08 +00:00
Tobias Diekershoff	6ee747dee8	missed something	2017-11-04 09:48:20 +01:00
Michael	4347e479d3	noscrape now contains "last-activity" which tells roughly the last activity	2017-11-04 08:38:22 +00:00
Tobias Diekershoff	53f83dc0a1	typo	2017-11-04 09:31:57 +01:00
Tobias Diekershoff	08977cbc6b	this setting is not used anymore	2017-11-04 08:32:34 +01:00
Tobias Diekershoff	87c39cc396	this setting is not used anymore	2017-11-04 08:23:56 +01:00
Tobias Diekershoff	33ad8117ce	this setting is not used anymore	2017-11-04 08:22:42 +01:00
Tobias Diekershoff	503ffa98d2	settings for checkversion	2017-11-04 08:15:28 +01:00
Tobias Diekershoff	1928217f83	added config wrapper around new option, opt-in	2017-11-03 15:52:40 +01:00
Tobias Diekershoff	79add903fe	wording	2017-11-03 15:52:40 +01:00
Tobias Diekershoff	778c83bf25	show a notification in the admin panel if a newer version is available	2017-11-03 15:52:40 +01:00
Michael	d739fe2503	Issue 3860: Enhanced support of "!" for forums	2017-11-03 05:07:19 +00:00
Michael	937f36f754	@posts to only the forum should be treated like !posts	2017-11-02 21:25:20 +00:00
Michael	a2f9ea2642	Forum posts with "!" are now created directly as forum post	2017-11-02 20:15:14 +00:00
Michael	82321114ab	If a post is dedicated to a single forum then it will be rewritten to a forum post	2017-11-01 23:20:43 +00:00
Michael	5222606602	Use the exclamation mark to address forums as well	2017-10-31 19:33:23 +00:00
hoergen	a5d8d1fd77	Update display.php adding baseurl to image tags for twitter and open Graph	2017-10-31 02:45:58 +01:00
Michael	e2224a2ddc	Some Webfinger clean up	2017-10-28 11:48:29 +00:00
Michael	0b7e8b7fb4	Hubzilla doesn't return the handle in the hcard	2017-10-27 06:17:24 +00:00
Hypolite Petovan	0c347d1466	Merge pull request #3819 from annando/photo-rework Better handling for GIF even, if not supported by the graphics library	2017-10-23 13:04:52 -04:00
Hypolite Petovan	476d7d9533	Merge pull request #3813 from annando/remove-old-stuff Removed stuff that was never used or isn't used anymore	2017-10-23 10:00:16 -04:00
Michael	b513a597c8	Static methods should be called statically	2017-10-21 16:13:25 +00:00
Michael	2624abdc35	Now only resize if supported	2017-10-21 15:31:31 +00:00
Michael	09727024ba	Better handling for GIF even, if not supported by the graphics library	2017-10-21 15:09:47 +00:00
rabuzarus	f2d51737eb	fix some HTML violations in frio	2017-10-20 15:21:42 +02:00
Michael	69afe50345	Removed stuff that was never used or isn't used anymore	2017-10-19 07:41:15 +00:00
Michael	0695fa699c	Removed "service class" functionality	2017-10-18 21:44:27 +00:00
Michael	c92ed9bc5e	Bugfix: Switch to all networks when posts for a single contact are selected.	2017-10-18 18:54:06 +00:00
Tobias Diekershoff	59ce6de50c	Merge pull request #3805 from annando/nodeinfo-fix Bugfix: Local comments weren't calculated.	2017-10-18 19:13:58 +02:00
Michael Vogel	d60f96f0e1	Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event add event action: duplicate events	2017-10-18 18:57:58 +02:00
Michael	3b783f6ac9	Bugfix: Local comments weren't calculated.	2017-10-18 16:54:12 +00:00
rabuzarus	10ba6df17f	initilize $sh_disabled	2017-10-18 13:23:26 +02:00
Tobias Diekershoff	a1099a021a	relocation message is also send to D* contacts	2017-10-18 11:04:44 +02:00
Tobias Diekershoff	edb16f8dc8	Merge pull request #3803 from annando/conversation-feed we now provide a feed for the conversation	2017-10-18 08:29:47 +02:00
Michael	4744d6bf84	we now provide a feed for the conversation	2017-10-18 06:25:22 +00:00
Michael	d675c84051	Issue 3801: Personal notes hadn't been displayed	2017-10-18 04:55:03 +00:00
rabuzarus	c1699364ae	reload the acl if a new event edit or copy modal is opened	2017-10-15 22:34:31 +02:00
Michael	08f461f70c	Bugfix: Revive dead contacts	2017-10-15 19:34:15 +00:00
rabuzarus	74d813042f	extend checkbox template for customized attributes	2017-10-15 18:45:49 +02:00
rabuzarus	4584670af4	add event action: duplicate events	2017-10-15 17:30:28 +02:00
Michael	5acdd18c00	Improve the data generation for the display page	2017-10-12 19:54:49 +00:00
Michael	a29b7e7153	"dba" is now a static class	2017-10-11 12:56:36 +00:00
Tobias Diekershoff	ed13034e23	Merge pull request #3773 from annando/force-republish Force a republish to the directory server	2017-10-09 21:39:24 +02:00
Michael	c8eefbd091	Force a republish to the directory server	2017-10-09 19:26:45 +00:00
Tobias Diekershoff	495b639e55	.com -> .ca	2017-10-08 10:22:29 +02:00
Michael	ecce105ae8	Avoid SQL error when in Forum view	2017-10-07 21:51:03 +00:00
Michael	68c6788762	Bugfix: Wrong function in search	2017-10-07 19:51:49 +00:00
Michael	88a70f9e2a	Possibly better handling of the single user admin setting	2017-09-30 13:58:07 +00:00
Michael	bd88179419	Add additional checks for the worker	2017-09-30 11:19:46 +00:00
Alexandre Alapetite	da4b08fc4a	SQL fix fbrowser (RC) https://github.com/friendica/friendica/pull/3742 Fixing non-standard GROUP BY, and non-standard ORDER BY. ``` DB Error 1055: Expression #2 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'friendica.photo.id' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by q, fbrowser_content SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` FROM `photo` WHERE `uid` = 1 AND `album` != 'Contact Photos' AND `album` != 'Contact Photos' GROUP BY `resource-id` ORDER BY created DESC LIMIT 0, 10 2017-09-27T17:16:35Z@tmkfko6titb71nug3i4vr1mnb1 [NORMAL]:dba.php:553:p DB Error 1055: Expression #2 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'friendica.photo.id' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by q, fbrowser_content ``` ``` ERROR 1055 (42000): Expression #1 of ORDER BY clause is not in GROUP BY clause and contains nonaggregated column 'friendica.photo.created' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by ```	2017-09-28 21:24:07 +02:00
Michael	289dde39ce	Removed unused setting	2017-09-25 19:05:05 +00:00
Michael	66515ed85e	Diaspora: Posts from Diaspora relais are transmitted the old way	2017-09-25 04:24:47 +00:00
Michael	8983dcaa77	Improvements for following/unfollowing of Diaspora and OStatus	2017-09-23 14:48:27 +00:00
Michael	b79c3241c6	Directly serve atom+xml if requested	2017-09-19 11:53:19 +00:00
Michael	72b42ad688	Last blob is now filled with the new functions	2017-09-15 21:17:58 +00:00
Michael	dfd48dd6f6	"qu" is no more	2017-09-15 21:00:39 +00:00
Michael	6d7ececc42	Bugfix for pictures that weren't stored / reworked database calls	2017-09-15 19:41:30 +00:00
Michael	c12075a005	Merge remote-tracking branch 'upstream/develop' into network-page	2017-09-15 06:42:33 +00:00
Tobias Diekershoff	0384e875a2	Merge pull request #3702 from annando/new-dba The old database function is now replaced with a wrapper	2017-09-15 08:31:25 +02:00
Michael	c3589dc043	Added documentation	2017-09-14 06:10:33 +00:00
Michael	c6ceae5225	The old database function is now replaced with a wrapper	2017-09-14 05:19:05 +00:00
Michael	92537d6926	Rearranged code	2017-09-13 09:20:08 +00:00
Michael	a5cf2c69c8	Reworked network page	2017-09-13 06:43:43 +00:00
Michael	3dcd281de4	Rearranged code	2017-09-12 11:04:59 +00:00
Michael	c636b0a6b2	We can now unfollow a contact without deleting it	2017-09-12 06:08:24 +00:00
Michael	4b403e4fe2	OStatus: Reworked import	2017-09-10 07:21:23 +00:00
Michael	637eb0bfb4	Bugfix: Mails weren't sent	2017-09-08 15:14:33 +00:00
Michael	d25670a4e6	"remote self" should work now	2017-09-06 16:20:14 +00:00
Michael	b1668ffdda	Address instead of url	2017-09-01 19:32:12 +00:00
Michael	88fb02db8d	Small correction	2017-08-31 12:10:17 +00:00
Michael	0e8104b172	Links to profiles in mails mow show the profile address and "redir" always works	2017-08-31 12:01:44 +00:00
Michael	5f33f28b9e	Display hadn't shown public items that weren't known to the user	2017-08-30 20:20:01 +00:00
Michael	5ab697e726	Removed unused template variable	2017-08-30 06:20:01 +00:00
Michael	02179e9419	Some missing tab	2017-08-30 06:16:31 +00:00
Michael	04f286dca2	Support for JSON based webfinger	2017-08-30 05:34:37 +00:00
Michael	1893c3df16	Pleroma-Servers are now detected and displayed in the statistics	2017-08-29 16:40:08 +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	21b239cbc7	Documentation was updated. (Reference to poormancron removed)	2017-08-25 02:49:25 +00:00
Michael	6998897a34	Limit the number of feed entries (Can solve resub problems)	2017-08-23 23:01:37 +00:00
Michael	2293757a36	Just some empty lines	2017-08-23 20:33:32 +00:00
Michael	b378f5fb01	The "hub" url now contains the nickname	2017-08-23 05:01:15 +00:00
Michael	e607a9dcda	Our user feeds now look more like OStatus	2017-08-22 10:18:07 +00:00
Michael	17b05c9ad9	Hash tag links now do a redir	2017-08-19 09:22:50 +00:00
Michael	791fc1d8b3	DFRN: Improved delivery status handling	2017-08-16 04:08:57 +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	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 Vogel	adf06e9c81	Merge pull request #3627 from tobiasd/20170812-invite wrong url	2017-08-12 09:33:14 +02:00
Tobias Diekershoff	3b67ef3e9c	wrong url	2017-08-12 07:46:37 +02:00
Michael	05393a6faa	Merge remote-tracking branch 'upstream/develop' into dba-2	2017-08-11 16:24:33 +00:00
Michael	99f0c01cdd	Some more changed queries	2017-08-11 16:21:55 +00:00
Michael	d352a290fe	Parameter wasn't replaced	2017-08-11 08:55:07 +00:00
Michael	d810b21f87	New dba functions	2017-08-11 08:04:01 +00:00
Tobias Diekershoff	e6e8ebbac5	Merge pull request #3622 from annando/new-dba Enhanced dba functions, several replaced database calls	2017-08-11 08:11:20 +02:00
Tobias Diekershoff	e89e008565	missing bracket	2017-08-10 10:31:45 +02:00
Michael	fce72cbbc8	Modifed "update" and "insert" function / many changed queries	2017-08-09 21:12:41 +00:00
Tobias Diekershoff	6504156508	add a switch to the Markdown parser for using hard line breaks (issue 3592)	2017-08-09 16:04:53 +02:00
Tobias Diekershoff	ee6956a91a	else is sufficient here	2017-08-03 07:23:05 +02:00
Tobias Diekershoff	0c8c69371c	no global directory URL defined?	2017-08-03 07:22:29 +02:00
Tobias Diekershoff	6cf951c930	use /servers instead of /siteinfo for the directory link in invitations	2017-08-02 08:48:01 +02:00
Tobias Diekershoff	7034d6efbd	use /servers instead of /siteinfo for the directory link in invitations	2017-08-02 08:47:09 +02:00
Tobias Diekershoff	016e4a0efc	Show contacts personal message in local profile	2017-08-01 17:47:13 +02:00
Michael	55569f9df3	This is a fix for issue 3536. Now likes aren't show anymore on the community page.	2017-07-31 19:29:43 +00:00
Michael	c98ae304c0	Endless scroll now avoids showing the same items	2017-07-31 06:04:37 +00:00
Michael	79fe249c54	Better use a wrapper	2017-07-22 06:43:04 +00:00
Michael	5d7e1e1a15	Use the realpath for the handling with (temporary) paths	2017-07-22 05:50:25 +00:00
Tobias Diekershoff	b5f58d317e	there was a string not marked for translation	2017-07-14 15:21:08 +02:00
Michael Vogel	896bf4046c	Merge pull request #3569 from tobiasd/20170702-delete delete item from admin panel	2017-07-10 18:44:19 +02:00
Tobias Diekershoff	dc41ac0f61	use drop_item and some magic	2017-07-10 14:55:40 +02:00
Tobias Diekershoff	9304bb6422	Typos	2017-07-07 20:54:26 +02:00
Tobias Diekershoff	aabde5422b	allow the admin to delete an item by GUID from the admin panel	2017-07-07 10:38:07 +02:00
rabuzarus	8ed6b037cf	Merge pull request #3561 from annando/issue-3560 Guests should be able to use the search as well	2017-07-04 01:09:01 +02:00
Michael	e26991ba26	Guests should be able to use the search as well	2017-07-03 20:48:44 +00:00
Michael Vogel	2b161108fe	Merge pull request #3439 from tobiasd/20170506-token [Needs OpenID testing] Add token to register	2017-07-02 21:31:53 +02:00
Michael Vogel	578cb0a55c	Merge pull request #3539 from AndyHee/20170617-admin_settings Corrected names for counting/ listing account-types in admin panel	2017-06-28 07:24:41 +02:00
Michael	be3bfaec80	Only show the number of workerqueue entries that aren't done	2017-06-20 02:05:16 +00:00
Michael	cf179188b6	Some more worker fine tuning	2017-06-17 13:58:18 +00:00
AndyHee	d7b411e9bc	Corrected names of account-types	2017-06-17 12:36:14 +07:00
Tobias Diekershoff	de5a0dadb0	Merge pull request #3534 from AndyHee/20170609-User_settings Better input hints, user settings, account types	2017-06-09 12:39:50 +02:00
Andy H3	c8f87e1c28	Updated settings.php	2017-06-09 16:21:25 +07: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
Hypolite Petovan	9c0d2c31e8	Replace AND and OR in PHP conditions by && and \|\|	2017-06-07 22:00:59 -04:00
Michael	97fd47c614	Moved include to top	2017-06-07 08:46:38 +00:00
Michael	6e6941a546	We have an alternate link	2017-06-06 21:56:25 +00:00
Michael	932e14971f	Issue 2864: Add a "alternate" link on display page	2017-06-06 17:56:22 +00:00
Michael	21eb9a4b2e	Fixed locking behaviour for the worker	2017-06-03 07:25:01 +00:00
Michael	f6d10198cc	Bugfix: The poller often couldn't store the pid in the workerqueue	2017-05-30 13:20:29 +00:00
Tobias Diekershoff	f3c3c57a0e	Merge pull request #3497 from annando/1705-dbstructure-admin-page The database structure is now checked ad the admin summary page	2017-05-28 11:07:45 +02:00
Michael	104acec09c	The database structure is now checked ad the admin summary page	2017-05-28 08:39:41 +00:00
Hypolite Petovan	e762531134	Restore missing include	2017-05-27 21:47:54 -04:00
Michael	e37b6bcd41	Probing via web frontend shouldn't use the cache.	2017-05-23 19:38:47 +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
Michael	80103f8ad9	Issue 3309: Avatar update should work now	2017-05-16 21:21:54 +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
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
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
Michael Vogel	bc724f2b68	Merge pull request #3458 from Hypolite/bug/missing-require-poco Missing require for poco_serverlist	2017-05-09 06:56:32 +02:00
Hypolite Petovan	108f0b2d1e	Improve refactoring - Rename $contacts to $users where meaningful - Use Config::get instead of get_config - Move requires for lazy inclusion	2017-05-08 23:03:52 -04:00
Hypolite Petovan	d5b660a72f	Add missing require for poco_serverlist	2017-05-08 21:55:19 -04:00
Hypolite Petovan	70cc2ccc7a	Fix standards + refactored variables with meaningful names	2017-05-08 21:55:04 -04:00
rabuzarus	cc8a3a4101	rename methods of the Probe class to camelCase	2017-05-08 16:19:10 +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	74479c4020	Merge pull request #3448 from annando/1705-dba-functions The first queries are replaced with the new functions. More to come ...	2017-05-07 17:10:39 -04: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
Alexandre Alapetite	02faf42403	Fix SQL syntax bug in mod message	2017-05-07 21:39:00 +02: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	86cae070f2	Merge branch 'develop' into improvement/move-app-to-src-2	2017-05-07 12:58:11 -04:00
Michael	c52b2f392f	Probing has to be done uncached	2017-05-07 16:33:54 +00:00
Michael	aa88691bc1	Diaspora: Accept new Salmon format	2017-05-07 13:11:11 +00:00
Tobias Diekershoff	dacef3683a	add token to register	2017-05-06 14:49:53 +02:00
Tobias Diekershoff	20d69dee27	missing translation call	2017-05-03 07:11:21 +02:00
Hypolite Petovan	dfd4c8528e	Add new documentation page about moving classes to src	2017-05-02 23:37:40 -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
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
Hypolite Petovan	f3a64ebfcb	Merge pull request #3411 from annando/1704-ping-order Unread notifications are now always on top	2017-04-29 16:36:03 -04:00
Michael	1088e51d69	Remove commented code.	2017-04-29 20:21:54 +00:00
Michael	715e15cbe1	There is now a memory limit for the poller	2017-04-29 17:36:46 +00:00
Michael	96afaaa0d5	Unread notifications are now always on top	2017-04-29 14:22:49 +00:00
Michael	edbbdf9761	Store conversation data for self created posts as well	2017-04-29 05:44:13 +00:00
Michael	ba5780c4a1	Remove the "discard" button for contact requests from Diaspora.	2017-04-28 08:36:10 +00:00
Hypolite Petovan	4493f37af3	Merge pull request #3390 from annando/1704-cleaned_install Added a PDO check in the install routine and cleaned it up	2017-04-27 21:17:13 -04:00
Tobias Diekershoff	7adb968653	removed commented out line	2017-04-27 07:31:57 +02:00
Tobias Diekershoff	ae580e5829	Merge pull request #3393 from Shnoulle/develop_feature3334 Simple robots.txt for server 404 log	2017-04-27 07:23:01 +02:00
Denis Chenu	20d4fbffef	Coding standards : doxygen + tab + single quote	2017-04-26 17:26:13 +02:00
Denis Chenu	e354a75dc8	Doxygen standard	2017-04-26 17:09:10 +02:00
Denis Chenu	6ef8d18297	Coding standards part and bad empty Disallow - Unsure PHP_EOL is the best here : PHP_EOL are not the same on *nux and win, it's not for server , but for browser - _content vs _init : seems not really a web content ?	2017-04-26 17:07:24 +02:00
Denis Chenu	4942c97785	Simple robots.txt for server 404 log	2017-04-26 15:39:35 +02:00
Hypolite Petovan	188d3a6f5e	Renamed check_domain_blocklist to blocked_url - Remove debug	2017-04-26 00:23:01 -04:00
Hypolite Petovan	c7e1a8e871	Added check_domain_blocklist	2017-04-25 22:45:56 -04:00
Hypolite Petovan	7d9d22914f	Refactor "URL" to "domain" for blocklist - Add slash trimming to domain - Reformatted mod/friendica	2017-04-25 22:45:42 -04:00
Hypolite Petovan	0b8f80c747	Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel blocklist front end for the admin panel	2017-04-25 21:23:20 -04:00
Tobias Diekershoff	f146c85e75	standards	2017-04-25 18:57:50 +02:00
Michael	efcb166c2d	Added check for MySQL driver for PDO.	2017-04-25 06:10:14 +00:00
Michael	49ba2f9d6d	Added a PDO check in the install routine and cleaned it up	2017-04-25 05:55:20 +00:00
Hypolite Petovan	82ea7ead66	Merge pull request #3374 from rabuzarus/20170407_-_group_edit Frio: provide own group template + some restructuring in group.php	2017-04-24 19:50:46 -04:00
Tobias Diekershoff	eeb72bd879	docstrings for the admin panel functions	2017-04-24 23:47:05 +02:00
Tobias Diekershoff	f969f44603	added subpage for blocklist management to the admin panel	2017-04-24 23:45:05 +02:00
Tobias Diekershoff	7f837a9205	add the contents from the blocklist to the /friendica page	2017-04-24 23:43:39 +02:00
Hypolite Petovan	bc2dd690fd	Merge pull request #3386 from rabuzarus/20170422_-_Stream_content_update_2 improve profile page (wall) update for non logged in users and remote users	2017-04-23 21:43:27 -04:00
rabuzarus	88602de604	fall back to unseen items if no timestamp is available	2017-04-23 16:22:53 +02:00
Sandro Santilli	cd521b2dcc	Urlencode query parameters	2017-04-23 13:50:33 +02:00
Sandro Santilli	ebc926a716	Add missing query string introducing character Fixes #3383	2017-04-23 13:50:18 +02:00
Michael	2628ff91f4	Call it "toinnodb"	2017-04-22 21:55:16 +00:00
Michael	aaa558f7ea	New command in dbstructure.php to convert all tables from MyISAM to InnoDB	2017-04-22 21:36:01 +00:00
rabuzarus	5a7b9676ff	fixed typo	2017-04-22 22:10:43 +02:00
rabuzarus	53c1bf6ba3	improve profile update for non logged in ussers and remote users	2017-04-22 22:08:05 +02:00
rabuzarus	b273165873	Remove unused function	2017-04-21 16:13:16 +02:00
rabuzarus	f99bb958f6	Merge develop into 20170407_-_group_edit Conflicts: mod/group.php	2017-04-21 16:09:48 +02:00
rabuzarus	40e5436604	some restructuring in groups.php + Frio: provide own group template	2017-04-21 16:04:29 +02:00
Alexandre Alapetite	5b80a1fcaa	mod photos compatibility only_full_group_by Related to https://github.com/friendica/friendica/pull/3323	2017-04-20 21:23:45 +02: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 Vogel	83cc56e713	Merge pull request #3326 from Alkarex/utf8mb4 Default to utf8mb4	2017-04-20 05:28:16 +02:00
Michael	e16fb74b0c	Reworked OStatus communication part to better support Mastodon.	2017-04-19 21:37:00 +00:00
Hypolite Petovan	2c69d36886	Remove extra htmlentities in notifications	2017-04-18 19:34:46 -04:00
Michael	33d5e5b818	Issue 3157: No fulltext anymore	2017-04-18 20:09:05 +00:00
Michael	47fd9226c3	Resubmit all profiles on directory change	2017-04-17 21:39:11 +00:00
Alexandre Alapetite	d1888ac05c	SQL AS for messages Fix bug introduced in https://github.com/friendica/friendica/pull/3323	2017-04-17 15:01:05 +02:00
Alexandre Alapetite	07faa14361	Merge branch 'develop' into utf8mb4	2017-04-16 22:08:48 +02:00
Alexandre Alapetite	a2a03c3f70	Default UTF8MB4 for CREATE DATABASE	2017-04-16 16:04:38 +02:00
Alexandre Alapetite	c35eef625a	More general date test for dob	2017-04-16 15:36:01 +02:00
Alexandre Alapetite	6b250d3ae9	Merge branch 'develop' into MySQL5.7	2017-04-16 15:16:58 +02:00
Alexandre Alapetite	d076b39b64	Forgotten AS in mod/admin patch	2017-04-15 23:48:02 +02:00
Alexandre Alapetite	8b3f623d29	ANY_VALUE in mod/admin The query was not standard, not deterministic, and was not doing what its description says. The patch makes it more standard and a bit more deterministic. The returned protocol type is still undeterministic.	2017-04-15 23:42:10 +02:00
Alexandre Alapetite	d2b3e0daf5	Merge develop	2017-04-15 01:03:21 +02:00
Alexandre Alapetite	6be6badd91	SQL typo mod/message Mistake in previous commit	2017-04-15 00:45:30 +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
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
Pierre Rudloff	ead9cbe534	Web app manifest (fixes #3317 )	2017-04-13 16:46:36 +02:00
Michael	d82684219a	Issue 3331: Removed unneeded table "deliverq"	2017-04-13 04:51:16 +00:00
Alexandre Alapetite	38e7a0f793	Fix GROUP BY for search https://github.com/friendica/friendica/issues/3322 Fix MySQL ERROR 1055 (42000): Expression #1 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'friendica.item.author-id' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by	2017-04-12 22:55:02 +02:00
Alexandre Alapetite	534ea6aefc	Fix ping_init SQL According to review https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628	2017-04-12 18:54:54 +02:00
Alexandre Alapetite	9fb4ba2b73	Fix profile wrong DISTINCT + ORDER BY Fix: ERROR 3065 (HY000) Expression #1 of ORDER BY clause is not in SELECT list, references column 'friendica.item.created' which is not in SELECT list; this is incompatible with DISTINCT	2017-04-12 18:49:29 +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
Alexandre Alapetite	c3e933642e	Fix missing SQL group by in ping https://github.com/friendica/friendica/issues/3322	2017-04-12 14:17:16 +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
Hypolite Petovan	05a5e1792d	Left trim at sign from nicks in ACL	2017-04-10 22:09:49 -04:00
Hypolite Petovan	ffbf330585	Merge pull request #3310 from annando/1704-probing Avoid possible problems with numeric nicknames and GNU Social	2017-04-09 01:08:12 -04:00
Michael	5c75fe4c14	Avoid possible problems with numeric nicknames and GNU Social	2017-04-09 04:29:02 +00:00
Hypolite Petovan	472345d740	Merge branch 'develop' into space_before_t	2017-04-08 23:17:31 -04:00
rabuzarus	6338636ff3	short test with array	2017-04-08 23:46:59 +02:00
rebeka-catalina	050675a629	The other lone comma in 1177	2017-04-08 18:07:30 +02:00
rebeka-catalina	554704e6b9	Added a whitespace between comma and t()	2017-04-08 16:57:24 +02:00
rebeka-catalina	d8a8fa9baa	Modified the warning message	2017-04-08 16:48:11 +02:00
rebeka-catalina	7320327fa1	Deleted the lone comma between paratheses	2017-04-08 16:37:18 +02:00
rebeka-catalina	895a6254a0	Correction of 1177 and added modification to 1171	2017-04-08 15:48:15 +02:00
rebeka-catalina	bcfbfeeba4	adding space for readability	2017-04-08 13:52:37 +02:00
rebeka-catalina	4c9c83e8e8	Warning, that profile published in local directory may be visible in public	2017-04-08 13:21:35 +02:00
rebeka-catalina	892ef45474	Warning, that profile published in local directory may be visible in public	2017-04-08 13:13:38 +02:00
Hypolite Petovan	cfb99aa323	Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser frio: fbrowser styling	2017-04-07 00:01:46 -04:00
Michael	407e25e7d6	Some little standard stuff	2017-04-04 05:39:43 +00:00
Michael	a0216af4bb	Issue 1720: Group filter and new tab don't like each other	2017-04-04 05:35:04 +00:00
rabuzarus	ee293f2ce2	Merge develop into 20170321_-_frio-fbbrowser Conflicts: view/theme/frio/js/filebrowser.js view/theme/frio/js/theme.js view/theme/frio/templates/filebrowser.tpl view/theme/frio/templates/jot.tpl	2017-04-03 00:51:34 +02:00
Roland Häder	49527b70d3	Merge branch 'develop' into rewrites/coding-convention-split2	2017-04-01 22:16:08 +02:00
Roland Haeder	3cea176ef2	added spaces + used x () Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-01 22:12:53 +02:00
Michael	240a0961c6	Standards ...	2017-04-01 17:08:11 +00:00
Michael	f6d7ee2781	Issue 3142: mcrypt is no more (as well as phpseclib)	2017-04-01 08:28:42 +00:00
Roland Haeder	60552260e1	Continued with CR: - added spaces as requested - removed parentheses from include/require calls as they are no functions Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 21:04:39 +02:00
Roland Haeder	d4e67338d8	space-time contines ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:56:43 +02:00
Roland Haeder	18ca141f5c	space-time! Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:52:43 +02:00
Roland Haeder	44a137a8de	Continued a bit: - converted multiple single-line comments into one multi-line comment - added spaces (space-time!) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:51:47 +02:00
Roland Haeder	07a0d300c3	added space, marked rest 86 occurrences in todos.txt Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:49:58 +02:00
Roland Haeder	9cfcf8f7ca	added spaces, marked in todos.txt as usual Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:47:44 +02:00
Roland Haeder	eab654dd65	$tagged is being initialized but not written to until the foreach() loop is being executed. Maybe here is old-lost code anyway? Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:45:15 +02:00
Roland Haeder	8824da8962	Continued a bit: - recommended way is to use foreach() instead of own looping through arrays - even when you need the index: <?php foreach ($someArray as $key => $value) { // Handle $key/$value somehow } ?> Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:37:01 +02:00
Roland Haeder	6db3d72ee3	added spaces (space-time!) and TODO that x() is maybe proper way? Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:33:11 +02:00
Roland Haeder	d98ac6b42d	Continued a bit: - removed parentheses from include/require as they are no functions - added type-hint for $a which is unused btw. Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:31:00 +02:00
Roland Haeder	0bc15efef6	whoops, parser error fixed Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:51:42 +02:00
Roland Haeder	192f6d7cf4	merged 2 if() into one three times Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:49:03 +02:00
Roland Haeder	de5125a4c7	merged 2 if() into one as requested by CR Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:45:49 +02:00
Roland Haeder	2a480df6fa	added spaces + removed parentheses (include/require are no functions) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:44:55 +02:00
Roland Haeder	6b8f581897	added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:42:09 +02:00
Roland Haeder	f998438d43	removed old-lost code by CR request Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:38:36 +02:00
Roland Haeder	5bc2ebb267	Please use x() correctly: <?php if (x($someArray, 'element')) { // Do something } ?> Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:37:08 +02:00
Roland Haeder	3d595c4dcc	Continued a bit: - added spaces / curly braces - converted multiple single-line comments into one multi-line comment - used more dbm::is_result() - include/require are no functions, let's not abuse them ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:33:24 +02: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
Roland Haeder	9c056d0bf0	it is ... SPACE TIME! ;-) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 20:30:35 +02:00
Roland Haeder	e0f4d22049	removed old-lost code by CR request + spaces added ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 20:26:50 +02:00
Hypolite Petovan	55e4bab00e	Improve babel page display for diaspora2bb mode - Fix formatting	2017-03-26 19:06:22 -04:00
Michael	8fe1fc2f52	Remove parendingsdas	2017-03-26 13:12:02 +00:00
Michael	92f5315320	We now return basic system data via nodeinfo at every time.	2017-03-26 12:51:25 +00:00
Michael	4168d47ecd	Issue 3248: Make communityhome work again.	2017-03-26 05:29:24 +00:00
rabuzarus	b6ab3bdd36	make use of Config class	2017-03-25 21:07:12 +01:00
Hypolite Petovan	f1a75a57fe	Merge pull request #3257 from annando/1703-gcontact Improved gcontact handling	2017-03-25 15:35:41 -04:00
rabuzarus	a2ad013830	some work on code standards compliance	2017-03-25 19:12:16 +01: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	73ee285212	rewrote for() loop to foreach() + added curly braces/spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 14:33:59 +01:00
Roland Haeder	006b4b88b2	Continued: - added curly braces/spaces - converted multiple single-line comments into one multi-line comment Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 14:07:59 +01:00
Roland Haeder	177a0c8320	Continued: - used dbm::is_result() to avoid E_WARNING when false is returned - added curly braces + some spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:23:15 +01:00
Roland Haeder	e503141b0c	added spaces and curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:18:39 +01:00
Roland Haeder	67707247c8	Continued: - added curly braces/spaces - changed lower-case SQL keywords to upper-case - used dbm::is_result() instead of count() (avoids warning in case of false is returned) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:15:42 +01:00
Roland Haeder	c1287df655	removed old-lost code + internal TODO closed Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:12:41 +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
Roland Haeder	506af8b556	changed "and" -> && according to CR Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 12:47:47 +01:00
Michael	0d49143a63	"no_utf" wasn't in use anymore - it is now removed completely	2017-03-25 10:51:00 +00:00
Hypolite Petovan	29fb28de43	Remove Embedly integration - Remove admin setting input	2017-03-25 01:57:19 -04:00
Roland Haeder	239dfea4e6	it is space-time! ;-) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 22:40:33 +01:00
Roland Haeder	caad9f5214	added more spaces (CR request) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 22:36:52 +01:00
Roland Haeder	be717649a4	added more curly braces/spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 22:34:13 +01:00
Roland Haeder	c0be733d6d	Opps, became lazy here, thanks to @Hypolite finding it. Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 21:15:36 +01:00
Roland Haeder	b5b3451b31	Continued: - marked commented-out code as possible old-lost - added more curly braces - used more dbm::is_result() where SELECT is stated - ! added quotes in array element, else (here) >thumb< (without quotes) is considered as a constant and causes an E_NOTICE Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 20:57:52 +01:00
Roland Haeder	c4b82133e9	added more curly braces + spaces for #3254 Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 23:06:28 +01:00
Roland Haeder	16c405b387	more spaces added (CR by @Hypolite) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:22:41 +01:00
Michael	1d6910277d	Remove more deprecated "poco_check" calls	2017-03-22 07:11:58 +00:00
rabuzarus	835e54dfc3	upload images to the selected album	2017-03-21 23:08:37 +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
Hypolite Petovan	7b352f3f74	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04: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	0557a42e2f	add missed NULL_DATE	2017-03-20 17:19:24 +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	24ee60492b	If the maintenance reason is a url, then redirect to this address	2017-03-19 19:03:09 +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	8dd732a896	Issue 3242: Define a maintenance reason	2017-03-19 13:24:07 +00:00
Michael	132688d663	Standards, what else?	2017-03-19 08:04:04 +00: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 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	d529125c8e	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:24 +01:00
Roland Häder	aeb0ed32c8	added curly braces + removed more useless intval() calls on file_exists() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	fef61a28cc	fixed chmod 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	0cd241bcbe	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:44:40 +01:00
Roland Häder	5f71da5862	added more curly braces + spaces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +01:00
Roland Häder	958c24e9f3	spaces -> tab + added spaces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +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	5471dd79e8	added missing curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:21 +01:00
Roland Häder	63e4750b4a	more coding convention applied: - added curly braces - added spaces where needed - $r only needs to be tested with dbm::is_result() - made SQL keywords all uper-case Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:21 +01:00
Roland Häder	1c6535c0b4	applied coding convention: - replaced space -> tab (code indenting) - added curly braces - used dbm::is_result() if $r is no result (may happen) Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:21 +01:00
Michael	1a436264cd	Some standards	2017-03-18 12:13:43 +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
rabuzarus	e1d22ef5d4	some code cleanup	2017-03-17 19:10:48 +01: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
rabuzarus	8ae8465d48	add dop event & fix event edit	2017-03-16 20:15:25 +01: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 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
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	eaf93dc041	I guess, @Hypolite will still find something to change ...	2017-03-13 17:23:02 +00:00
Michael	0dbc72c4ea	Embrace the braces and spaces ...	2017-03-13 16:18:45 +00:00
Michael	d2bad13e83	Added documentation	2017-03-13 14:57:11 +00:00
Michael	fbb84ee219	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-13 10:18:29 +00:00
Tobias Diekershoff	dfc5dc2e9e	Merge pull request #3223 from annando/1702-no-language The language string isn't displayed anymore	2017-03-13 08:26:43 +01:00
Michael	eb6a6228f7	more spaces	2017-03-13 05:57:37 +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	b6a4a2ec7f	Merge remote-tracking branch 'upstream/develop' into 1702-no-language	2017-03-12 20:50:20 +00:00
Michael	18d23ca443	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-12 20:49:48 +00: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
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	0989f725a6	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-05 16:23:58 +00:00
Michael	2775adfdf5	Second followup for profile issue	2017-03-05 11:07:10 +00:00
Michael	b42167f0ac	We can now return a list of known servers	2017-03-04 11:04:00 +00:00
Michael	ec9dddb445	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-04 10:33:43 +00:00
Michael	461ee5c8a8	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-04 08:38:04 +00:00
Michael	8690b97c27	Follow up for issue 3196: We need an index hint for performance issues	2017-03-04 08:25:47 +00:00
Michael Vogel	9ccb6072b8	Merge pull request #3205 from tobiasd/20170226-issue3187 Bugfix issue 3187	2017-03-03 21:36:37 +01:00
Tobias Diekershoff	2fa9f76e67	better wording and placeholder for name	2017-03-03 10:28:29 +01:00
Michael	324d8bfe8e	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-02 20:20:38 +00:00
Michael	3ab845dcf3	Issue 3196: Not all forum posts weren't shown	2017-03-01 21:47:10 +00:00
Michael	cc86d8ea14	Language data won't be displayed anymore (it was experimental stuff)	2017-02-27 23:59:05 +00:00
Michael	0afb0c2ea4	NULL_DATE is now a constant	2017-02-27 23:37:15 +00:00
Michael	997e94555b	The old pager is removed	2017-02-27 21:46:37 +00:00
Michael	39386ded36	"old_share" is removed	2017-02-27 21:26:37 +00:00
Michael	99fb15037b	Removed some more unneeded stuff	2017-02-27 06:27:22 +00:00
Michael	733caa5669	Removed admin settings	2017-02-26 23:19:13 +00:00
Michael	48209f0ecd	Now there is only the worker.	2017-02-26 23:16:49 +00:00
Michael	2a8a5a6d88	Improved server vitality detection	2017-02-26 18:19:20 +00:00
Tobias Diekershoff	7442ce3d6d	change Fan/Admirer to Subscriber	2017-02-26 16:47:11 +01:00
Michael	f9f27c2f5f	Merge remote-tracking branch 'upstream/develop' into 1701-performance	2017-02-23 06:55:35 +00:00
Michael	cec79ddf2b	See issue 3157: Fulltext is now disabled	2017-02-21 05:23:37 +00:00
Tobias Diekershoff	a4dcd8be55	Merge pull request #3159 from annando/bugfix-diaspora-relay Bugfix: Only accept postings from anyone when the relay is configured	2017-02-11 08:58:38 +01:00
Michael	40390cc5ec	Diaspora Relay: Only accept postings from anyone when the relay is configured	2017-02-10 20:45:22 +00:00
rabuzarus	3474b40732	fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts	2017-02-10 03:51:01 +01:00
Michael	9c4a53e380	Optimized query for nodeinfo, better way to analyze posting problems with DFRN	2017-02-04 16:16:15 +00:00
Michael	49834676c7	Bugfix issue 3116: Only allowed themes are displayed	2017-01-31 05:14:32 +00:00
rabuzarus	6d01dd83fe	Bugfix: fix the author image in the meta elements in html head (display module)	2017-01-30 15:23:44 +01:00
Michael	c1eea3771f	Bugfix: Sometimes the self contact seems to destroy itself	2017-01-29 13:57:03 +00:00
Tobias Diekershoff	069dd5b75d	Merge pull request #3125 from annando/alternate-pr-3124 Alternate solution for pull request 3124	2017-01-28 15:25:30 +01:00
Michael	ea22828d37	Alternate solution for pull request 3124	2017-01-28 12:19:04 +00:00
Tobias Diekershoff	af699940d4	typo	2017-01-28 11:20:39 +01:00
Tobias Diekershoff	703628cd01	wording	2017-01-28 11:12:31 +01:00
Tobias Diekershoff	83607ff894	enforce them, but inform the user about it	2017-01-28 10:10:35 +01:00
Tobias Diekershoff	334bc7037a	don't enfoce non-empty passwords during installation	2017-01-28 10:02:32 +01:00
Hypolite Petovan	c38a5e443d	Merge branch 'develop' into issue/#3062 * develop: (68 commits) Added documentation update to the translation update to the translations translation docs now contain basic usage of the Transifex client - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content - Remove misc TinyMCE mentions in docs and minifyjs - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter - Remove TinyMCE mentions in themes - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value Remove tinyMCE libraries limit the description of the meta tag to 160 characters in /mod/display Improved handling of non string values in the config Bugfix: Caching of non string cache values now works. Reformatted stuff, improved query Auto-focus first input field of modal when shown Use cache instead of config for storing last proc_run time Some added logging Bugfix for masses of php warnings Rearranged the logging Some changed logging ... # Conflicts: # view/theme/frost-mobile/js/theme.js # view/theme/frost/js/theme.js	2017-01-27 15:30:21 -05:00
Michael Vogel	d61a4a67db	Merge pull request #3109 from Hypolite/issue/scrap-tinymce Scrap TinyMCE	2017-01-27 21:08:33 +01:00
Tobias Diekershoff	722b18ead7	Merge pull request #3096 from annando/1701-index-again Some more index stuff	2017-01-27 16:52:12 +01:00
Hypolite Petovan	bf6d235b26	- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content	2017-01-26 23:04:38 -05:00
Hypolite Petovan	66482c1d9c	- Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter	2017-01-26 22:57:53 -05:00
Hypolite Petovan	9d5384f107	- Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value	2017-01-26 22:50:27 -05:00
rabuzarus	4c8de5fcfd	limit the description of the meta tag to 160 characters in /mod/display	2017-01-25 13:10:42 +01:00
Michael	becfeaf0b7	Bugfix: Caching of non string cache values now works.	2017-01-24 18:55:07 +00:00
Michael	df28f99caa	Merge remote-tracking branch 'upstream/develop' into 1701-index-again	2017-01-24 06:48:05 +00:00
Michael	ea18d1829f	Reformatted stuff, improved query	2017-01-24 06:45:46 +00:00
rabuzarus	5ab6843f38	Bugfix: fix typo in event variable	2017-01-20 13:24:53 +01:00
Michael	75097ebf37	Added limit	2017-01-19 10:00:44 +00:00
Michael	0548099f6c	The config class now makes less database reads.	2017-01-18 21:45:32 +00:00
Michael	53393233c3	Replace the direct access of config variables	2017-01-17 19:21:46 +00:00
Michael	47d04416b1	As well here ...	2017-01-15 15:18:31 +00:00
Michael	99e9791d1f	We fetched a little bit too much ...	2017-01-15 15:06:32 +00:00
Michael	7e846ba7ac	Hide the calculation for "previous" and "next" behind a setting	2017-01-15 14:50:26 +00:00
Michael	3af099298c	Some more caching	2017-01-13 17:31:10 +00:00
Michael	844fefc9c4	Caching the events.	2017-01-13 13:04:37 +00:00
Michael	fd5f151a72	New function to detect heavily used indexes	2017-01-13 07:46:47 +00:00
Michael	e67133ef56	Merge remote-tracking branch 'upstream/develop' into 1701-curl-range Conflicts: mod/oexchange.php mod/uimport.php	2017-01-12 07:25:44 +00:00
Hypolite Petovan	b61479ba6e	Merge remote-tracking branch 'friendica/develop' into issue/#3062 # Conflicts: # view/theme/duepuntozero/theme.php # view/theme/smoothly/theme.php	2017-01-12 09:19:59 +11:00
Michael Vogel	5eaa5951a1	Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3 Normalize App parameter declaration (mod folder, 2 out of 3)	2017-01-11 22:49:01 +01:00
Michael Vogel	05a2989ecb	Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3 Normalize App parameter declaration (mod folder, 3 out of 3)	2017-01-11 22:33:41 +01:00
Michael Vogel	df8b522f6b	Merge pull request #3077 from Hypolite/issue/#3039-mod-1of3 Normalize App parameter declaration (mod folder, 1 out of 3)	2017-01-10 17:28:21 +01:00
Michael	a2debaa68a	Download limit for fetching data via "z_fetch_url"	2017-01-09 23:10:32 +00:00
Hypolite Petovan	a7ce601580	Normalize App parameter declaration (mod folder, 3 out of 3)	2017-01-09 23:14:55 +11:00
Hypolite Petovan	f92918f471	Normalize App parameter declaration (mod folder, 2 out of 3)	2017-01-09 23:14:25 +11:00
Hypolite Petovan	8a197055e3	Normalize App parameter declaration (mod folder, 1 out of 3)	2017-01-09 23:12:54 +11:00
Hypolite Petovan	479180ca8e	Merge branch 'develop' into issue/#3062	2017-01-08 11:44:45 +11:00
Michael	ed0143c9f0	Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes	2017-01-07 16:13:57 +00:00
Hypolite Petovan	daa8e4f901	Cleaning up, actual changes are in the next commits - Formatting - Trailing spaces - Extraneous blank lines - Large comments	2017-01-08 02:03:11 +11:00
Michael	c2543f918b	Last minutes changes	2017-01-07 13:52:30 +00:00
Michael	1b48799f08	Don't do queries if not needed	2017-01-07 11:28:18 +00:00
Michael	6976ad4892	Removed some removed indexes	2017-01-06 06:37:27 +00:00
Roland Häder	42c2e09382	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-04 09:03:00 +01:00
Michael	db2d0e0095	removal of useless variable	2017-01-01 23:38:32 +00:00
Michael	79b5eb63db	Some more reverts	2017-01-01 23:37:29 +00:00
Michael	212f78386d	Deactivated the auto mention - we should do it differently.	2017-01-01 23:35:34 +00:00
Michael	8aaf09f9ee	Automatically add a Diaspora mention	2017-01-01 23:18:42 +00:00
Michael	8c579735f9	Diaspora: Add a mention when doing a thread reply	2017-01-01 21:21:16 +00:00
Roland Haeder	d2df464d8c	added curly braces + fixed indenting according to code review by Hypolite Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-30 21:49:08 +01:00
Roland Haeder	d2280d4120	Merge remote-tracking branch 'upstream/develop' into develop dbm::is_result() calls needed merge Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-30 21:33:41 +01:00
Michael Vogel	c348dd6134	Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh Update the photo albums cache on upload, album deletion or renaming	2016-12-29 11:08:16 +01:00
Tobias Diekershoff	236c7805a4	for the fed stats it is better to have a >= then a = in the query	2016-12-27 17:53:59 +01:00
rabuzarus	a6d7ad0755	Update cache on photo edit only when album name has changed	2016-12-26 02:41:00 +01:00
rabuzarus	08fb35838c	Update the photo albums cache on upload, album deletion or renaming	2016-12-25 16:58:38 +01:00
Roland Haeder	f844d96a7f	added some spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 20:21:38 +01:00
Roland Haeder	b7c9d63b7a	Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated. Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 20:09:10 +01:00
Roland Haeder	3dbb92c0dc	added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:11 +01:00
Roland Haeder	89319d9579	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:09 +01:00
Roland Haeder	45dd1ccc7b	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:08 +01:00
Roland Haeder	c1b76e889e	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:06 +01:00
Roland Häder	54905a3d81	added more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:51:02 +01:00
Roland Häder	3472191b05	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:51:00 +01:00
Roland Häder	8ce20f975c	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:50:58 +01:00
Roland Häder	8b8a45b703	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:50:53 +01:00
Roland Häder	9fad8109ff	changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } --------------------- Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:50:21 +01:00
Roland Häder	9b6ad2fc47	Coding convention: - added curly braces - added space between "if" and brace - also added TODO (old-lost code?) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:49:39 +01:00
Roland Häder	f8a213e23b	much more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:49:36 +01:00
Roland Häder	97c507e763	Coding convention applied: - space between "if" and brace - curly braces on conditional blocks Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:49:15 +01:00
Roland Häder	31cd3fb33c	Coding convention continued: - added curly braces - added spaces between if/foreach and brace - made code block look nicer (spaces added, tabs replaced by space) - added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 17:13:34 +01:00
Roland Häder	13b57d4d50	Coding convention continued: - added curly braces - added spaces between if/foreach and brace - made code block look nicer (spaces added, tabs replaced by space) - added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 17:12:34 +01:00
Roland Häder	5547bc2cc2	Continued rewriting a bit: - more usage of dbm::is_result() - nicer look of code Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 17:03:00 +01:00
Roland Häder	d82ed5d1b4	Continued with code convention: - added more curly braces - added space betweent if/foreach and brace - added spaces for beautification - converted some " to ' (mixed usage) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 15:31:23 +01:00
Roland Häder	c9194b0381	Continued with code convention: - added more curly braces - added space betweent if/foreach and brace - added spaces for beautification - converted some " to ' (mixed usage) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 15:30:23 +01:00
Roland Häder	20e71d21a6	Merge branch 'rewrites/app_get_baseurl_static' into develop Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/admin.php mod/bookmarklet.php mod/community.php mod/contacts.php mod/crepair.php mod/editpost.php mod/events.php mod/install.php mod/lostpass.php mod/network.php mod/notify.php mod/suggest.php mod/uexport.php mod/videos.php view/theme/duepuntozero/config.php view/theme/frio/config.php view/theme/quattro/config.php view/theme/vier/config.php	2016-12-22 11:37:23 +01:00
Roland Häder	ad20c5504d	Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/diaspora.php object/Item.php	2016-12-22 11:33:00 +01:00
Roland Häder	c0df692f5f	Merge remote-tracking branch 'upstream/develop' into develop Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/diaspora.php object/Item.php	2016-12-22 11:29:56 +01:00
Michael Vogel	9e689e8b9b	Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links Diaspora: Complete /people/* links from fcontact or author domain	2016-12-22 10:17:44 +01:00
Roland Häder	a314dbc562	removed conflict solving remains, took from upstream/develop Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 09:14:14 +01:00
Roland Häder	8b7d5d0efc	Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static	2016-12-22 09:06:00 +01:00
Roland Häder	4c04a78d1b	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 09:03:44 +01:00
rabuzarus	2fcbba9410	provide local time for notifications	2016-12-22 00:28:52 +01:00
rabuzarus	125d2f24dd	frio: add profile link to the notifications url	2016-12-21 23:17:55 +01:00
Roland Haeder	b3d33ee1e6	More curly braces added, left some TODOs behind Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:17:47 +01:00
Roland Haeder	59404e4eaf	More curly braces added, left some TODOs behind Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:17:36 +01:00
Roland Haeder	d3e666f71a	added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:12:28 +01:00
Roland Haeder	d97b6a2eba	added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:04:09 +01:00
Roland Haeder	d80b82c55d	no need for this else block Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 22:53:32 +01:00
Roland Haeder	e6a4a736fc	no need for this else block Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 22:53:08 +01:00
Roland Haeder	0436782e70	Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 20:01:51 +01:00
Roland Häder	7f98c8086c	added curly braces + space Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/events.php	2016-12-21 09:31:31 +01:00
Roland Häder	bb37cac772	added curly braces + space Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-21 09:30:49 +01:00
Hypolite Petovan	47f88bd625	proxy mod: Standards bearer - Enforced PSR-2 standards - Normalized concatenation formatting - Normalized string delimiters - Normalized condition operators - Collapsed directly nested conditions - Used dvm::is_result - Added comments	2016-12-21 09:15:20 +01:00
Hypolite Petovan	1f94cb9aac	proxy: Simplify url extension extraction	2016-12-21 09:14:49 +01:00
Hypolite Petovan	c0ec9c5907	proxy_url: Fix extension extraction for URLs containing a . after a ?	2016-12-21 09:14:09 +01:00
Roland Häder	b580c23844	Merge remote-tracking branch 'upstream/develop' into develop Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/proxy.php	2016-12-21 09:11:58 +01:00
Roland Haeder	3befdc6920	used more App::get_baseurl() instead of get_app()->get_baseurl(). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:51:54 +01:00
Roland Haeder	7c342600c3	used more App::get_baseurl() instead of get_app()->get_baseurl(). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:51:25 +01:00
Roland Haeder	9814414b6a	used dbm::is_result() instead of count() Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:39:06 +01:00
Roland Haeder	b4bc07fdcc	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:32:00 +01:00
Roland Haeder	536f078ed4	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:31:05 +01:00
Hypolite Petovan	e54ee2e509	Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension # Conflicts: # include/follow.php	2016-12-20 15:29:30 -05:00
Hypolite Petovan	b2768d8f1c	proxy mod: Standards bearer - Enforced PSR-2 standards - Normalized concatenation formatting - Normalized string delimiters - Normalized condition operators - Collapsed directly nested conditions - Used dvm::is_result - Added comments	2016-12-20 15:23:08 -05:00
Roland Haeder	52f14ffa5f	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:17:09 +01:00
Roland Haeder	6e44acfed6	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:15:53 +01:00
Hypolite Petovan	6e929934c5	proxy: Simplify url extension extraction	2016-12-20 15:14:43 -05:00
Roland Haeder	b6d11f2129	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-20 19:33:40 +01:00
Hypolite Petovan	e8e1f9253d	Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links # Conflicts: # include/follow.php	2016-12-20 12:50:36 -05:00
Hypolite Petovan	4a7c3b9eef	Diaspora: Fix class name case + add self	2016-12-20 12:44:15 -05:00
Roland Häder	de689583e2	added more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/admin.php	2016-12-20 17:58:34 +01:00
Roland Häder	4b221d216e	added more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 17:57:40 +01:00
Michael Vogel	7141ce9163	Merge pull request #3030 from Hypolite/bug/proxy_url_extension proxy_url: Fix extension extraction for URLs containing a . after a ?	2016-12-20 17:53:26 +01:00
Roland Häder	4805aa8fdb	Don't cherry-pick: - reverted dbm::is_result() to count() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 16:28:23 +01:00
Michael	4aafbb09a5	The object type "photo" is deprecated and was replaced by "image" Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/like.php mod/photos.php mod/subthread.php	2016-12-20 16:00:23 +01:00
Roland Häder	b9e4b9f274	Merge remote-tracking branch 'upstream/develop' into develop Changes in #3034 were somehow conflicting. :-( Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/like.php mod/photos.php mod/subthread.php	2016-12-20 15:44:31 +01:00
Tobias Diekershoff	cc16369b6f	Merge pull request #3033 from annando/1612-object-type The object type "photo" is deprecated and was replaced by "image"	2016-12-20 15:44:07 +01:00
Roland Häder	51716957b2	converted more to dbm::is_result() + added braces/space Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 15:37:27 +01:00
Roland Häder	4f26bee453	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:45:36 +01:00
Roland Häder	0e58bf6675	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:45:16 +01:00
Roland Häder	d5f2d387bd	Continued a bit: - added more curly braces around conditional blocks - added space between "if" and brace - aligned "=>" (will do with more if wanted) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:42:33 +01:00
Roland Häder	b69d82e64c	Continued a bit: - added more curly braces around conditional blocks - added space between "if" and brace - aligned "=>" (will do with more if wanted) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:42:10 +01:00
Roland Häder	a883514604	Opps, forgot this ... Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:38:23 +01:00
Roland Häder	c22878643b	Opps, forgot this ... Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:38:11 +01:00
Roland Häder	a25b628286	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:36:09 +01:00
Roland Häder	8d28135c59	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:35:18 +01:00
Roland Häder	ace8f753ac	added much more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/bookmarklet.php mod/community.php mod/contacts.php mod/crepair.php mod/events.php mod/network.php mod/suggest.php mod/uexport.php view/theme/duepuntozero/config.php view/theme/frio/config.php view/theme/quattro/config.php view/theme/vier/config.php	2016-12-20 11:59:13 +01:00
Roland Häder	e24c3a5b82	added much more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:56:34 +01:00
Roland Häder	5f41375ad3	Continued: - added curly braces + spaces - added todo about testing empty/non-empty strings Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:41:20 +01:00
Roland Häder	51d352922a	Continued: - added curly braces + spaces - added todo about testing empty/non-empty strings Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:39:53 +01:00
Roland Häder	fc9dbc0899	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:38:28 +01:00
Roland Häder	5588472f6d	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:38:16 +01:00
Roland Häder	f3529e7dbc	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:36:27 +01:00
Roland Häder	c86f09a894	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:36:03 +01:00
Roland Häder	2e908ebbbf	added more curly braces + fixed space->tab for code indentation. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:33:42 +01:00
Roland Häder	c1845c97cc	added more curly braces + fixed space->tab for code indentation. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:33:04 +01:00
Roland Häder	4780df394d	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/notify.php	2016-12-20 11:28:39 +01:00
Roland Häder	507db84243	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:27:40 +01:00
Roland Häder	fd0e2a9406	added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:22:22 +01:00
Roland Häder	9c097c20dd	added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:21:32 +01:00
Roland Häder	fa444f373c	added curly braces + space between "if" and brace + added missing @param Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:19:23 +01:00
Roland Häder	4299cce719	added curly braces + space between "if" and brace + added missing @param Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:18:54 +01:00
Roland Häder	e05a8e9974	added curly braces + space between "if" and brace + added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:15:15 +01:00
Roland Häder	40bdc5d33c	added curly braces + space between "if" and brace + added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:14:30 +01:00

... 12 13 14 15 16 ...

4772 commits