Friendica/friendica-github

mirror of https://github.com/friendica/friendica synced 2024-11-15 09:33:54 +00:00

Author	SHA1	Message	Date
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
Roland Häder	6ab84bf520	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:04:53 +01:00
Roland Häder	92ad87590b	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:04:29 +01:00
Roland Häder	40dc3774e4	Also here (was committed in other branch, too. :-( ) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:02:57 +01:00
Roland Häder	4dce3d8224	changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } --------------------- Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 10:58:55 +01:00
Roland Häder	a9bed1422e	added more curyl braces + spaces between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 10:44:59 +01:00
Roland Häder	be35349495	added more curyl braces + spaces between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 10:44:27 +01:00
Roland Häder	4dfe64bd5a	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-20 10:40:17 +01:00
Roland Häder	65e1cd728c	Coding convention: - added curly braces - added space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 10:40:09 +01:00
Roland Häder	064b53e673	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-20 10:39:06 +01:00
Roland Häder	a5e4882e25	Coding convention: - added curly braces - added space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 10:35:28 +01:00
Roland Häder	5a90e7f822	Continued a bit: - converted some bad checks to use dbm::is_result() - added space between "if" and brace - added curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 10:20:10 +01:00
Roland Häder	abff6372dd	Coding convention applied: - space between "if" and brace - curly braces on conditional blocks Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/lock.php	2016-12-20 10:12:31 +01:00
Roland Häder	fb676335db	Coding convention applied: - space between "if" and brace - curly braces on conditional blocks Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 10:10:33 +01:00
Michael	6e46987515	The object type "photo" is deprecated and was replaced by "image"	2016-12-20 07:10:47 +00:00
Hypolite Petovan	403d1f987f	proxy_url: Fix extension extraction for URLs containing a . after a ?	2016-12-19 20:19:26 -05:00
Roland Häder	dac1dbd3e9	Merge branch 'rewrites/dbm_is_result' into develop	2016-12-19 14:47:05 +01:00
Roland Häder	a96eb3428d	Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are more pending ... Also put SQL table columns into back-ticks. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-19 14:46:33 +01:00
Roland Häder	884f44ce94	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-19 14:27:16 +01:00
Roland Häder	4615f39836	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-19 14:21:26 +01:00
Roland Häder	ff569756ee	Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/follow.php	2016-12-19 09:40:34 +01:00
Thomas Willingham	a58d8d2c71	This error message had me confused for about twenty minutes. I couldn't figure out what was wrong with my imagick install that would make it give me an orange button if it was installed. Of course, the problem was that it wasn't installed, and the message was worded badly. This is a bit less confusing.	2016-12-19 00:10:11 +00:00
Roland Häder	a126db451c	Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 10:12:00 +01:00
Roland Häder	2c9d282136	Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 10:11:25 +01:00
Roland Häder	9c564c4fd3	Again, static OR object-referencing calls? Blue or red pill? Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 10:06:20 +01:00
Roland Häder	c43e9aa74e	get_basepath() uses a lot $this (which means object-referenced calls, or non-static calls). but still it is called statically in many places. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 10:06:12 +01:00
Roland Häder	2eb3727542	Again, static OR object-referencing calls? Blue or red pill? Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 10:05:18 +01:00
Roland Häder	b54c22666c	get_basepath() uses a lot $this (which means object-referenced calls, or non-static calls). but still it is called statically in many places. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 10:03:06 +01:00
Roland Häder	378cbd9027	Continued with #3010 : - more reverts of $a->get_baseurl() - you always do: function foo (&$a), please read my TODO why it is not so good. - for now I have fixed this inconsistency (compared to other method signatures) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 09:59:13 +01:00
Roland Häder	8e1796bb1f	Continued with #3010 : - more reverts of $a->get_baseurl() - you always do: function foo (&$a), please read my TODO why it is not so good. - for now I have fixed this inconsistency (compared to other method signatures) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 09:57:55 +01:00
Roland Häder	ba3bc420ca	Also reverted these + added spaces for nicer appearance. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 09:23:59 +01:00
Roland Häder	6cef88c24e	Also reverted these + added spaces for nicer appearance. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-15 09:23:41 +01:00
Roland Häder	a31acb5fda	Opps, this has vanished by accident, thanks to @annando Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 16:41:16 +01:00
Roland Häder	a85470b172	Opps, this has vanished by accident, thanks to @annando Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 16:36:32 +01:00
Roland Häder	c75d6ad850	More dbm::is_result() instead of count() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 12:03:02 +01:00
Roland Häder	cee169997e	Opps, no && and AND in same line (confusing, thanks to @annando) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 10:02:39 +01:00
Roland Häder	042ed17826	removed own debug lines (no more needed). Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 09:58:27 +01:00
Roland Häder	036edc2fd0	added extra spaces to make it look nice. #3010 Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 09:56:27 +01:00
Roland Häder	46d383369c	Cleanup for #3010 - added spaces, thanks to @annando . Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 09:41:33 +01:00
Roland Häder	6de232c60a	Cleanup for #3010 - removed all redundant lines found by @rabuzarus Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 09:31:27 +01:00
Roland Häder	797de5bfe0	Nope, get_basepath() should be static, then also mark it as static (in signature). Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-13 14:53:57 +01:00
Roland Häder	63610c7b73	Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/Photo.php include/api.php include/cache.php include/dbstructure.php include/enotify.php include/items.php include/onepoll.php include/queue_fn.php include/session.php include/text.php mod/contacts.php mod/dfrn_request.php mod/display.php mod/events.php mod/item.php mod/message.php mod/msearch.php mod/photos.php mod/poco.php mod/profile.php mod/proxy.php mod/videos.php update.php view/theme/diabook/theme.php view/theme/vier/theme.php	2016-12-13 11:00:44 +01:00
Roland Häder	6a8a36f12d	More usage of dbm::is_result($r) instead of count($r): - count() returns very different results and never a boolean (not even false on error condition). - therefore you should NOT use it in boolean expressions. This still can be done in PHP because of its lazyness. But it is discouraged if it comes to more clean code. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-13 10:44:13 +01:00
Roland Häder	293436e5fd	Some rewrites: - max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called both way, static and with object reference. - this is strongly discouraged and should be avoided as its support (in PHP) may be dropped in future releases. - used $a = get_app(); to encapsulate code (even when the function does currently the same, it may be changed later) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-13 10:16:36 +01:00
Roland Häder	47c60aa486	Opps, no need for this. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-13 10:01:56 +01:00
Roland Häder	d489ba1510	Merge remote-tracking branch 'upstream/develop' into develop Also removed <<<<< as this interfers (a bit) with searching for merge conflicts with a more simplier editor. Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/ping.php view/lang/fr/messages.po view/lang/fr/strings.php	2016-12-13 09:59:43 +01:00
Michael	23a97465e5	Avoid SQL errors	2016-12-11 07:09:48 +00:00
Michael	c666c98559	Code bautification	2016-12-10 12:28:49 +00:00
Michael	fc3c1601b1	Merge remote-tracking branch 'upstream/develop' into 1607-performance	2016-12-10 12:18:11 +00:00
Michael	e12227c000	The gcontact-id and the object field can now be stored with item_post	2016-12-09 09:57:02 +00:00
Tobias Diekershoff	ac5617c40c	add frontend worker to the admin panel and regen master messages.po file	2016-12-06 08:44:59 +01:00
Michael	b904aaff11	Merge remote-tracking branch 'upstream/develop' into 1612-spool	2016-12-02 09:54:34 +00:00
Michael	6845775ff9	Store spooled data	2016-12-01 20:53:18 +00:00
Michael	aea122cd20	Little improvements to the queries in ping.php	2016-12-01 13:44:30 +00:00
Tobias Diekershoff	1fc35d5f44	Merge pull request #2979 from annando/issue-2772 Issue 2772: Pending contacts should now be displayed	2016-12-01 08:51:04 +01:00
Michael	57c95c93e1	The frontend worker is now working as a full replacement for the crontab.	2016-11-30 19:24:58 +00:00
Michael	1f50dc368e	Merge remote-tracking branch 'upstream/develop' into 1611-frontend	2016-11-30 04:46:47 +00:00
Michael	cc5eebd173	The frontend worker can now fork background processes	2016-11-29 22:40:19 +00:00
Michael Vogel	d620c5d996	Merge pull request #2982 from rabuzarus/20161129_-_small_dfrn_request_polish dfrn_request: include the graphic of the connection process into the doxygen header	2016-11-29 21:09:59 +01:00
rabuzarus	a208d2e72b	dfrn_request: include the graphic of the connection process into the doxygen header	2016-11-29 19:57:30 +01:00
Michael Vogel	efb2df41ba	Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing Add protocol docu to the help docs	2016-11-29 19:38:31 +01:00
Michael Vogel	fa8eb101d4	Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries	2016-11-29 19:33:57 +01:00
rabuzarus	54f3867ebd	dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries	2016-11-29 15:52:12 +01:00
Michael Vogel	86665d47a6	Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish dfrn_request: added $blocked and $pending as variable to make code mo…	2016-11-29 09:42:26 +01:00
Tobias Diekershoff	d55d500e35	Merge pull request #2975 from annando/1611-frontend-worker The worker can now run from the frontend as well	2016-11-29 09:40:59 +01:00
rabuzarus	0d223aa6f1	dfrn_request: added $blocked and $pending as variable to make code more understandable	2016-11-29 03:08:46 +01:00
Michael	3a76a6766f	Issue 2772: Pending contacts should now be displayed	2016-11-28 22:11:13 +00:00
Michael Vogel	0ef764b167	Merge pull request #2970 from Hypolite/improvement/ping-php-json ping.php: Ensure data structure consistency	2016-11-28 21:08:36 +01:00
Michael Vogel	37e8f6b442	Merge pull request #2973 from rabuzarus/berlin_parse_url parse_url: recognize image/video/audio files + move functions into own class	2016-11-28 21:05:31 +01:00
rabuzarus	ac39928e5d	upload connection graphics & update doxygen headers to insert link to the spec	2016-11-28 16:23:47 +01:00
rabuzarus	d0cdf863a1	fix accidentally deleted line with local_user()	2016-11-28 15:30:36 +01:00
rabuzarus	743378129b	legacy support for function parseurl_getsiteinfo_cached()	2016-11-28 15:26:51 +01:00
rabuzarus	5458f40f6a	Bugfix: better detection dfrn_request of double connection requests	2016-11-28 01:13:47 +01:00
rabuzarus	f229d65f85	ParseUrl: some docu work	2016-11-27 23:41:55 +01:00
Michael	df0d33c138	Try to get more execution time	2016-11-27 10:01:24 +00:00
Michael	636a033364	Added documentation, config stuff, ...	2016-11-27 09:02:08 +00:00
Michael	e856ab9a09	The worker can now run from the frontend as well	2016-11-27 00:55:05 +00:00
rabuzarus	c96a53b4b4	parse_url: fix typo	2016-11-26 04:10:50 +01:00
rabuzarus	26664c22e0	parse_url: add some docu	2016-11-25 16:59:31 +01:00
rabuzarus	e9226eaf45	parse_url: recognize image/video/audio files + move functions into own class	2016-11-24 01:11:22 +01:00
Hypolite Petovan	0f33311f65	pig.php: remove debug	2016-11-22 23:04:00 -05:00
Hypolite Petovan	133120007c	Merge remote-tracking branch 'friendica/develop' into improvement/ping-php-json	2016-11-22 21:14:25 -05:00
Hypolite Petovan	58e03c5155	ping.php: Ensure data structure consistency - Formatting - Documentation	2016-11-22 21:11:22 -05:00
Michael Vogel	61da46677d	Merge pull request #2967 from Hypolite/issue/#2955 ping.php: Prevent $register_count from being undefined	2016-11-22 21:00:34 +01:00
Hypolite Petovan	e0322546d8	ping.php improvement: Prevent $register_count from being undefined	2016-11-22 14:17:05 -05:00
Michael	edbdd0e34a	Bugfix: We should only search in the current database for MyISAM tables	2016-11-22 16:47:08 +00:00
Tobias Diekershoff	754de768f2	Merge pull request #2960 from Hypolite/issue/#2955 ping.php Fix confusion between count vars and array vars	2016-11-22 08:13:36 +01:00
Hypolite Petovan	cc242d52f8	ping.php Fix confusion between count vars and array vars	2016-11-21 16:02:36 -05:00
Tobias Diekershoff	0628068977	Merge pull request #2952 from annando/issue-2772 Issue 2772: Posts from pending contacts should be displayed as well.	2016-11-20 17:56:05 +01:00
Michael	3de862712d	Issue 2772: Posts from pending contacts should be displayed as well.	2016-11-20 16:52:57 +00:00
Michael Vogel	b33e817586	Merge pull request #2951 from tobiasd/20161120-mysql add MySQL warning in admin panel	2016-11-20 17:09:49 +01:00
Tobias Diekershoff	dd4a23070c	Merge pull request #2950 from rabuzarus/berlin_fix_post_preview Bugfix: preview has sometimes phantom mentions and tags	2016-11-20 16:46:31 +01:00
Tobias Diekershoff	97c6f668e6	add a warning to the admin panel when the MySQL version is problematic	2016-11-20 16:32:38 +01:00
rabuzarus	66341046d2	Bugfix: preview has sometimes phantom mentions and tags	2016-11-20 16:19:55 +01:00
Tobias Diekershoff	b03009d962	use an array for warnings in admin panel	2016-11-20 16:14:09 +01:00
Michael	7ad4a8ca93	The warning if a group contains members of several network types can now be supressed.	2016-11-20 12:09:18 +00:00
Michael Vogel	7ca4648ffd	Merge pull request #2945 from tobiasd/20161119-admindbwarn Show a warning message in the admin panel when MyISAM is still in use	2016-11-20 12:38:52 +01:00
Tobias Diekershoff	38f9fab6c4	mysql keywords	2016-11-20 10:44:54 +01:00
Tobias Diekershoff	20f987e814	Merge pull request #2946 from annando/1611-bugfix-groups Bugfix: Filtering by group has to be done with the contact id in the thread table	2016-11-20 10:39:01 +01:00
Michael	68a31e084a	Bugfix: Filtering by group has always to be done with the contact id in the thread table	2016-11-20 09:24:56 +00:00
Tobias Diekershoff	7aaaa0a3c7	Show a warning message in the admin panel when MyISAM is still in use	2016-11-20 09:50:14 +01:00
Michael	d6be33cbbb	Avoid UTF8 warning in mod/proxy.php	2016-11-20 08:30:30 +00:00
Michael Vogel	5be5fa1b1d	Merge pull request #2930 from Hypolite/issue/#2925 Overhauling proxy_url/Fix encoded ampersand	2016-11-19 21:57:57 +01:00
Michael Vogel	67c1a20ed0	Merge pull request #2941 from Hypolite/improvement/ping-php-json ping.php performance: fix typo	2016-11-19 21:40:31 +01:00
Hypolite Petovan	61afd71897	ping.php performance: fix typo	2016-11-19 15:23:36 -05:00
Hypolite Petovan	1cf9506646	Overhauling proxy_url: use $shortpath for long URL in writemode	2016-11-19 14:03:31 -05:00
Tobias Diekershoff	b95bf00e89	Additional info in registration request	2016-11-19 18:22:49 +01:00
Michael Vogel	ea38af9799	Merge pull request #2931 from tobiasd/20161118-issue2926 send email confirming pending registration #2916	2016-11-19 15:21:06 +01:00
Tobias Diekershoff	f4c52f5a0e	send email confirming pending registration #2916	2016-11-18 20:16:22 +01:00
Hypolite Petovan	a6bdb2c34a	overhauling proxy_url - Decode possible HTML entities in the input URL - Add the safe extension for the shortpath as well - Formatting - Documentation	2016-11-17 23:08:00 -05:00
Hypolite Petovan	c6fbb46108	ping.php performance: Add JSON output - Added JSON/JSONP support - Added XML backward-compatible output - Updated main.js to handle JSON data - Removed unused references to non-existant DOM elements	2016-11-16 23:26:43 -05:00
Michael	126c4774c3	Merge remote-tracking branch 'upstream/develop' into 1607-performance Conflicts: include/dbstructure.php mod/item.php mod/nodeinfo.php	2016-11-16 06:27:21 +00:00
rabuzarus	9878974e1f	fix photos page permissions	2016-11-14 18:49:51 +01:00
Michael	1aa9b7242d	Merge remote-tracking branch 'upstream/develop' into 1611-parseurl	2016-11-13 19:12:11 +00:00
Michael Vogel	ce96624452	Merge pull request #2899 from tobiasd/20161109-stats prepare for Mastodon in the federation stats and include BlaBlaNet	2016-11-13 09:42:42 +01:00
Tobias Diekershoff	df3c776e1b	shorter foreach loop	2016-11-13 09:03:22 +01:00
Tobias Diekershoff	772d33342c	add unkown to empty version strings	2016-11-13 08:12:09 +01:00
Tobias Diekershoff	32b2d9952b	some platforms don't provide version information	2016-11-13 07:03:38 +01:00
Michael	e5f55a5919	Improved handling with wrong formatted urls and fetchinfo	2016-11-12 20:23:00 +00:00
Michael	e6148f4c1c	Performance improvements when storing items (via API)	2016-11-12 13:17:28 +00:00
Tobias Diekershoff	f9911637e3	help text for settings should be translateable	2016-11-10 10:21:24 +01:00
Tobias Diekershoff	350887f892	prepare for Mastodon in the federation stats and include BlaBlaNet	2016-11-09 14:25:51 +01:00
Michael	4b33573c20	Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean	2016-11-05 05:25:22 +00:00
rabuzarus	5459b00499	cache: serialize the cache content directly in the cache class	2016-11-04 16:44:49 +01:00
Michael Vogel	9dd3e9d19a	Merge pull request #2878 from Hypolite/improvement/ping-performance Improving ping.php performance	2016-11-02 21:56:18 +01:00
Michael	4d966e1e21	Changed priority for onepoll/further enhancement for dbclean	2016-10-31 21:32:08 +00:00
Michael	8ab90f02c3	Shadow entry mechanism improved	2016-10-29 21:27:56 +00:00
Michael	7bd79c67a7	Avoiding deadlocks and small sql improvements	2016-10-29 20:17:33 +00:00
Hypolite Petovan	8e50254bb9	Merge branch 'develop' into improvement/ping-performance	2016-10-28 22:26:38 -04:00
Hypolite Petovan	bc407080d2	ping.php performance: improve documentation and formatting	2016-10-28 22:14:51 -04:00
Hypolite Petovan	f1c855e755	ping.php performance: Cache notification bbcode - Add two fields to notifiy table to store cached bbcode result - Add bbcode conversion on notif creation - Add postfact caching if cache field is empty on retrieval	2016-10-28 06:28:16 -04:00
Michael	3f0656fdbd	Merge remote-tracking branch 'upstream/develop' into 1610-performance	2016-10-27 12:18:45 +00:00
Michael Vogel	4996003800	Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo Fix pgettext function name typo	2016-10-25 22:31:59 +02:00
Michael	967ecb4205	Merge remote-tracking branch 'upstream/develop' into 1610-performance Conflicts: include/Core/Config.php include/Core/PConfig.php	2016-10-25 16:16:01 +00:00
Michael Vogel	75a996c4e4	Merge pull request #2839 from Hypolite/Issue-#2822 Issue #2822 - Fix [Embedded content - reload the page to view]	2016-10-25 07:31:20 +02:00
Hypolite Petovan	2fc2a1a228	Fix typo in get_available_languages function name - Add Doxygen comment block - Fix formatting - Renamed variable for faster understanding	2016-10-24 22:17:02 -04:00
Hypolite Petovan	9ef63efa1c	Leave formatting alone	2016-10-24 16:16:49 -04:00
Hypolite Petovan	fb75394766	Some more formatting reverts	2016-10-24 12:43:38 -04:00
Hypolite Petovan	8787587011	Fix undiscriminate spaces=>tabs replace	2016-10-24 12:34:10 -04:00
Hypolite Petovan	789e1f4275	Revert some more unwarranted formatting	2016-10-24 12:27:27 -04:00
Michael Vogel	3463a442ba	Merge remote-tracking branch 'upstream/develop' into 1610-performance	2016-10-24 08:12:13 +00:00
Michael Vogel	8cab3b5592	More transactions, more queries on uncommitted data	2016-10-24 08:10:27 +00:00
Michael Vogel	ee5ada6991	We now use memcache if configured and installed.	2016-10-23 21:59:40 +00:00
Hypolite Petovan	2741726402	Reverting too extensive formatting changes	2016-10-22 21:33:54 -04:00
Michael Vogel	561f45b83b	And again ...	2016-10-22 10:33:18 +00:00
Michael Vogel	b429b85680	CSR changes, split dbclean in separate processes if worker is active	2016-10-22 10:14:41 +00:00
Michael Vogel	4c5a7fac83	Some stuff to make Hypolite happy :)	2016-10-21 21:32:27 +00:00
Michael Vogel	b56bdf06ed	Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check	2016-10-21 21:17:58 +00:00
Michael Vogel	501c45def5	Some more improved queries	2016-10-21 18:25:21 +00:00
Michael Vogel	fd2d8cc180	Orphans are removed without giant lock problems	2016-10-20 22:05:21 +00:00
Michael Vogel	abb827b784	Merge remote-tracking branch 'upstream/develop' into 1610-performance	2016-10-20 08:44:19 +00:00
Michael Vogel	493d7bc698	Remove orphaned data	2016-10-19 21:06:37 +00:00
Michael Vogel	356414846b	Check for duplicated postings from connectors	2016-10-17 19:17:11 +00:00
Michael Vogel	3e5cf5290e	Improved queries, more uncommitted queries	2016-10-17 18:38:51 +00:00
Michael Vogel	e09c55527c	Merge pull request #2856 from rabuzarus/0510-update_fullcalendar update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover	2016-10-16 18:04:11 +02:00
rabuzarus	8064ff6ecb	update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover	2016-10-16 16:04:53 +02:00
Michael Vogel	e5c7ce0902	Use "last-item" in the contact table instead of an expensive sql query	2016-10-14 05:45:32 +00:00
Hypolite Petovan	a843858654	Merge from develop	2016-10-08 13:45:14 -04:00
Michael Vogel	b70676d231	Optimized query for nodeinfo and admin user page	2016-10-07 21:07:21 +00:00
Michael Vogel	6abac720e2	Small performance tweaks for "item_store" as well.	2016-10-07 06:05:43 +00:00
Michael Vogel	f9b9ee6b77	Increased performance when storing items	2016-10-06 21:24:29 +00:00
Michael Vogel	aca6f63985	Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo	2016-10-05 16:19:42 +00:00
Michael Vogel	5fb2e47809	Increased performance when storing items	2016-10-05 16:12:53 +00:00
rabuzarus	2a3e235f9a	show/hide page-flags according to the account-type	2016-10-05 14:45:19 +02:00
Michael Vogel	8cde8b375b	Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type	2016-10-04 03:52:22 +00:00
Michael Vogel	66bec9475d	Improved queries for the nodeinfo functionality and the admin page	2016-10-04 03:51:13 +00:00
Michael Vogel	095fa872ed	Contact Type is now transmitted via poco	2016-10-04 03:48:01 +00:00
Michael Vogel	860f11e71b	Merge pull request #2842 from tobiasd/20160929-lng lang handling for #2752	2016-10-04 05:22:38 +02:00
Hypolite Petovan	d9a5554543	Fix Issue #2822 - Add new setting to user settings page - Convert formatting to PSR-2 - Add new bandwitdh saver setting	2016-10-02 15:25:10 -04:00
Hypolite Petovan	08a30bc1c6	Fix Issue #2822 - Update update_*.php files with new bandwitdh_saver user setting - Fix formatting according to PSR-2 - Add bandwitdh_saver setting check before replacing with "Embedded content - Please reload"	2016-10-02 15:23:05 -04:00
Michael Vogel	6d16c39b7e	dbstructure now switches in the maintenance mode when updating	2016-10-02 13:52:52 +00:00
rabuzarus	fa33f94b29	Merge pull request #2830 from annando/1610-account_type The account type is now read and displayed	2016-10-02 14:55:52 +02:00
Michael Vogel	60a0235af0	The account type is now read and displayed	2016-10-01 20:03:27 +00:00
Tobias Diekershoff	5cfca894c1	On registration use the browser preferred language for the new account	2016-10-01 15:55:56 +02:00
Tobias Diekershoff	7aa4f5297d	when the admin creates a new account, use the system language for this accounts	2016-10-01 15:55:18 +02:00
Hypolite Petovan	f0382bb159	Restore admin notification email on register approval - Reverted changes to mod/register.php - Added "show_in_notification_page" flag to prevent `notify` DB insertion	2016-09-30 08:57:16 -04:00
Hypolite Petovan	aa985502c9	Fix Issue #2813 - Remove adding a notification for each admin on register approval request - Fix wrong display of the above notification that is removed anyway - Fix comments	2016-09-29 23:17:35 -04:00
Michael Vogel	2f06e9360f	"Company" is now "Organisation" and there is an auto update	2016-09-26 19:35:01 +00:00
Michael Vogel	d632d282cd	We are now having an account type and are publishing it	2016-09-25 20:37:27 +00:00
Michael Vogel	196eb6009f	The XMPP address is now in the profile and will be transmitted	2016-09-25 15:28:00 +00:00
Hypolite Petovan	fdacc40b5f	Fix wrong data type	2016-09-24 13:51:53 -04:00
Hypolite Petovan	fac2d9a880	Fix registration request notification query - Removed wrong usage of COUNT in registration request query - Added simple count() of results	2016-09-24 13:49:55 -04:00
Michael Vogel	3f35fed35a	Special characters should be escaped	2016-09-23 06:29:02 +00:00
Roland Haeder	c1a15befc5	Some improvements/fix: - fixed curly brace bug (introduced by myself) - make all SQL keywords upper-case, column and table names lower-case - used some more dbm::is_result Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-09-20 22:18:35 +02:00
Tobias Diekershoff	e5c2c66487	Show the worker queue count if the workers are active	2016-09-20 15:45:55 +02:00
Roland Haeder	e171a1cd22	Some fixes: - avoids warning if no result is coming back - brought back init variable before using it Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-09-18 23:39:07 +02:00
Roland Haeder	c825cc8d0d	This merge brings back dbm::is_result() where I could find it. Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-09-18 23:21:18 +02:00
Tobias Diekershoff	f85821839b	display current state of PHP logging in admin panel logging informations	2016-09-13 22:52:21 +02:00
Michael Vogel	1bfdc216d0	Only close the session if it had been opened.	2016-08-16 21:35:12 +02:00
rabuzarus	2d0c503bf1	frio: fix - permissions string was missing	2016-08-13 18:58:49 +02:00
rabuzarus	826a13eb23	fix: own calendar is now always exportable for local_user()	2016-08-13 13:59:55 +02:00
Michael Vogel	1c31526d6e	HTML entities in Notifications aren't a problem anymore	2016-08-11 19:59:07 +02:00
Michael Vogel	b6dec53ec1	Bugfix: A parameter in xml::from_array was missing.	2016-08-11 08:44:03 +02:00
Michael Vogel	0ea9af3d7d	Ping is now using a standard routine to generate the xml.	2016-08-10 22:51:03 +02:00
Michael Vogel	61e3a8ca3a	Merge pull request #2702 from rabuzarus/0308-Notifications-restructure notifications restructure	2016-08-08 07:41:48 +02:00
rabuzarus	0532dc6a61	notifications - correct boolean variable checking	2016-08-07 12:26:49 +02:00
rabuzarus	de02154a1b	notifications - set default values for some varibles	2016-08-06 18:59:39 +02:00
Tobias Diekershoff	78514db6e8	now the installer checks for iconv module as well #2506	2016-08-06 08:54:41 +02:00
rabuzarus	3921113e5c	photos - include paginate into the templates - provide a photo_album.tpl for frio	2016-08-04 21:53:22 +02:00
Michael Vogel	2d63f9deb6	Worker fastlane can now be activated from the admin interface	2016-08-04 08:51:34 +02:00
rabuzarus	ae905cbd1b	Merge develop into 0308-Notifications-restructure Conflicts: mod/notifications.php	2016-08-03 12:53:38 +02:00
rabuzarus	ce3188d5c6	notifications - move intros to NotificationsManager & make json output work	2016-08-03 12:44:04 +02:00
rabuzarus	6d3c15fe91	notifications - add attendance notifications	2016-08-02 00:01:43 +02:00
rabuzarus	bcee356f66	notifications - add docu & pagination	2016-08-01 23:04:41 +02:00
rabuzarus	7a4be1cead	notifications.php: move more code to NotificationsManager	2016-08-01 18:18:11 +02:00
Michael Vogel	02b5f6a34d	Merge remote-tracking branch 'upstream/develop' into develop	2016-08-01 08:02:26 +02:00
Michael Vogel	668da905e2	"proc_run" is now called with priority.	2016-08-01 07:48:43 +02:00
Tobias Diekershoff	75be187216	Merge pull request #2682 from annando/1607-api-generic-xml API: XML is now generated without templates	2016-08-01 07:25:24 +02:00
Tobias Diekershoff	a684a1c519	Merge pull request #2691 from rabuzarus/2607-contact_confirm frio: intro templates + some restructure of core notifications.php	2016-08-01 07:15:24 +02:00
rabuzarus	f7fa5f166b	notifications.php: unify label strings	2016-07-30 11:03:21 +02:00
trebor	52f641904b	notifications.php: reduce code duplication	2016-07-30 10:51:21 +02:00
rabuzarus	f09cd57165	notifications.php - move duplicated code in an own function	2016-07-28 11:39:09 +02:00
rabuzarus	819b374401	notifications.php - move some template creation to the end of the file	2016-07-27 21:07:54 +02:00
rabuzarus	320751660d	frio: intro notifications + some restructuring in core for notifications	2016-07-27 19:53:22 +02:00
Michael Vogel	4e02b80868	Merge remote-tracking branch 'upstream/develop' into 1607-performance	2016-07-26 22:16:37 +02:00
Michael Vogel	287c9cfbdd	Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml	2016-07-26 22:15:49 +02:00
Michael Vogel	4961fb3a45	Unused indexes removed, queries changed	2016-07-26 22:10:13 +02:00
Tobias Diekershoff	18a35e9ceb	Merge pull request #2688 from rabuzarus/2607-drop frio: provide confirm modal	2016-07-26 10:45:52 +02:00
rabuzarus	694637f9c3	frio: provide confirm modal	2016-07-26 10:36:34 +02:00
rabuzarus	768d10536f	frio: templates for contact_edit and crepair	2016-07-26 09:09:40 +02:00
Michael Vogel	8bf7db06db	New indexes for the API	2016-07-19 08:43:57 +02:00
Michael Vogel	f27bc00464	Remove obsolote functions	2016-07-09 20:09:09 +02:00
Michael Vogel	4e5d335492	Removed the legacy function calls, removed unused functions	2016-07-04 08:05:30 +02:00
Michael Vogel	e4c6cfd2d8	Moves the function "is_result" from dba to dbm.	2016-07-02 14:00:42 +02:00
Michael Vogel	7d531afd00	Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced Conflicts: boot.php	2016-07-02 13:38:23 +02:00
Michael Vogel	a7ee8a8bc9	Avoid redirection loops at /fetch/ and /p/	2016-06-30 12:02:35 +02:00
Michael Vogel	6f203b0a75	urlencode is better	2016-06-30 08:58:36 +02:00
Michael Vogel	5341223617	Do a redirect when the post doesn't come from our system but we know where it comes from.	2016-06-30 08:55:26 +02:00
Michael Vogel	d125939888	Just some more centralised functionality	2016-06-30 07:46:00 +02:00
Michael Vogel	99f0746660	Cleaned up the code	2016-06-30 07:32:07 +02:00
Michael Vogel	2c7fd1cb3c	It should be now valid	2016-06-30 01:18:44 +02:00
Michael Vogel	c0669d365b	The key_id was added	2016-06-30 00:22:42 +02:00
Michael Vogel	2d72e2d932	Diaspora: Support for new fetch functionality (replacement for /p/)	2016-06-29 22:50:30 +02:00
rabuzarus	1f50db2b2a	viewcontacts - fix: tabmenu was not returned	2016-06-28 12:32:09 +02:00
rabuzarus	60b767168a	hovercard.php - fix tags for hovercard	2016-06-27 11:57:47 +02:00
Tobias Diekershoff	773517a734	Merge pull request #2638 from annando/1606-avatar-handling Imrpoved avatar handling when storing them/partly use of "micro"	2016-06-25 19:51:00 +02:00
rabuzarus	06959d745e	viewcontacts - make the tabbar available even if hide-friends is active	2016-06-25 16:20:44 +02:00
Michael Vogel	0b1188b7fe	Imrpoved avatar handling when storing them/partly use of "micro"	2016-06-25 13:56:55 +02:00
rabuzarus	073f520cee	add missing strings for frio	2016-06-25 12:21:13 +02:00
Tobias Diekershoff	782e31c5cf	Merge pull request #2634 from rabuzarus/2306_Update_Network network.php - raw && update mode don't need the network tabs	2016-06-24 06:59:35 +02:00
rabuzarus	cf696f6d1f	network.php - raw && update mode don't need the network tabs	2016-06-24 00:33:31 +02:00
Michael Vogel	eabf8734a8	Merge pull request #2631 from rabuzarus/1906-event-test cal export && public calendar - fix permissions	2016-06-23 23:24:27 +02:00
rabuzarus	55205e344f	Merge pull request #2632 from annando/1606-parse-title Always parse the first title element	2016-06-23 10:18:58 +02:00
rabuzarus	e352458ef0	pub calendar - permission clean up and docu	2016-06-23 10:07:13 +02:00
Michael Vogel	8cabcda5e0	Always parse the first title element	2016-06-22 21:00:58 +02:00
rabuzarus	111f77ac64	pub calendar - add sql perms to the query (I forgot to do this)	2016-06-22 15:06:14 +02:00
rabuzarus	cd92a0dc34	Merge pull request #2624 from annando/1606-contact-id Item: New fields for author id and owner id - avatar improvement with relocation	2016-06-22 14:26:39 +02:00
rabuzarus	2cac69ca86	cal export && public calendar - even better permissions testing	2016-06-22 13:50:47 +02:00
rabuzarus	8cc5dd35e8	cal export && public calendar - fix permissions	2016-06-22 00:39:52 +02:00
Michael Vogel	9a7653a4fe	Store the author-id and owner-id in mod/item.php as well	2016-06-21 07:54:45 +02:00
rabuzarus	d076f61a4a	cal export - little fix for json	2016-06-20 23:38:34 +02:00
rabuzarus	71c9f562ae	move the cal addon (exporting calendars) to core	2016-06-20 23:31:49 +02:00
Michael Vogel	939bd965c5	Search query optimized	2016-06-20 22:03:40 +02:00
Michael Vogel	65b541413f	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-20 07:28:47 +02:00
rabuzarus	7495a34b32	implement a public calendar for vistors of someones profile page	2016-06-19 22:04:34 +02:00
Michael Vogel	51b5d16f1b	Improved SQL queries	2016-06-19 21:41:06 +02:00
Michael Vogel	91db7a549c	Optimised the amount of function for the item query	2016-06-19 08:32:38 +02:00
Michael Vogel	e512a83ecc	Massively updated avatar handling	2016-06-19 01:07:20 +02:00
rabuzarus	7dc5fc8b9f	Merge develop into 1206-events-template Conflicts: view/theme/frio/css/style.css	2016-06-17 14:33:08 +02:00
rabuzarus	606f42701c	frio - event - some js and template refactoring + event view css styling	2016-06-17 14:09:18 +02:00
rabuzarus	c99da380cf	frio: events - adapt changes to the templates of the other themes	2016-06-17 10:33:12 +02:00
rabuzarus	82b6917c5f	frio: settings_display.tpl + rise frio to 0.2 Alpha	2016-06-13 10:57:42 +02:00
rabuzarus	5e98f27fcd	frio: events - work on event_form.tpl + datetime.php	2016-06-13 10:19:38 +02:00
rabuzarus	869a439466	Merge pull request #2595 from annando/1606-contact-priority Priority for native networks when searching by contact url	2016-06-13 09:28:54 +02:00
Michael Vogel	c68f28bc77	Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup	2016-06-12 21:07:45 +02:00
Michael Vogel	c05898c57d	The queries for items are unified (a little bit)	2016-06-12 21:04:55 +02:00
rabuzarus	b2ba25bd27	fix federation statistics	2016-06-12 19:15:12 +02:00
rabuzarus	0af572ffba	frio: first part for event template work	2016-06-12 18:23:10 +02:00
Michael Vogel	6d50d18242	Merge pull request #2584 from rabuzarus/0906-profiles some restructure in profiles.php + frio template for profiles settings	2016-06-12 14:20:42 +02:00
Michael Vogel	c138455c5e	Merge remote-tracking branch 'upstream/develop' into 1606-contact-priority	2016-06-12 12:16:24 +02:00
Michael Vogel	aac9caab2d	Priority for native networks when searching by contact url	2016-06-12 10:46:15 +02:00
Michael Vogel	5fc0f06786	Merge pull request #2590 from rabuzarus/1106_finding_string unify heading of search results to "results for:"	2016-06-11 11:53:20 +02:00
rabuzarus	ca269b6329	unify heading of search results to "results for:"	2016-06-11 10:44:52 +02:00
Michael Vogel	d48afb6c1b	Merge pull request #2586 from rabuzarus/1006-search frio: improvements in search behavior	2016-06-11 10:26:20 +02:00
rabuzarus	eafad7145b	mod/admin.php: some clean up	2016-06-11 10:12:03 +02:00
rabuzarus	db5438ab1a	frio: improvements in search behavior - search value woll be added to nav search input - focus on nav search input as main search - save search button appears in the second navbar if search is available - search heading appears in the second navbar - provide a mobile search by pressing the search icon - dirfind: heading distinguish between people and form search - some js fixes in theme.js	2016-06-10 20:34:25 +02:00
rabuzarus	e773da9ea2	frio + core: forgot to delete a comment	2016-06-10 11:29:23 +02:00
rabuzarus	3a9a9e6a1c	frio + core: some restructure in profiles.php + frio template for profiles settings	2016-06-10 11:24:38 +02:00
Tobias Diekershoff	ee06d2fa3c	Merge pull request #2582 from annando/1606-more-avatar-stuff Some more places where the avatar picture is taken from the database	2016-06-10 09:39:01 +02:00
Michael Vogel	807fbe173b	Some more places where the avatar picture is taken from the database	2016-06-10 07:44:32 +02:00
Michael Vogel	baf68af735	Merge pull request #2581 from tobiasd/adm-workerqueue show the workerqueue in the admin panel summary	2016-06-10 00:03:37 +02:00
Michael Vogel	c9342ccf1d	Merge pull request #2579 from rabuzarus/0806-content-experimental content: make experimental mod/content.php work again	2016-06-10 00:01:33 +02:00
Tobias Diekershoff	e8d39b290a	show the workerqueue in the admin panel summary	2016-06-09 18:08:40 +02:00
rabuzarus	e4ba493a01	Renamed "Search results for:" in "Results for:" to have more space on mobile	2016-06-09 13:06:21 +02:00
rabuzarus	5a48ab5a8c	content.php: remove load_contact_links()	2016-06-09 01:39:45 +02:00
rabuzarus	9e5a4b2050	content: make experimental mod/content.php work again	2016-06-09 01:35:57 +02:00
rabuzarus	71b30e0651	profice a general content wrapper template.	2016-06-07 16:32:02 +02:00
Michael Vogel	fc66a86dc5	Some optimized sql queries	2016-06-06 22:57:27 +02:00
rabuzarus	5c52736221	photo_menu: now the photo_menu does have at all places the same structure	2016-06-06 16:54:29 +02:00
Michael Vogel	8fbcba0096	The local contact search now uses local data if present	2016-06-05 22:21:34 +02:00
Michael Vogel	4b640dbd97	Fetching of profile data improved	2016-06-05 21:17:55 +02:00
Michael Vogel	ea3a6ec6eb	Some more cleanup and code removal.	2016-06-05 20:01:38 +02:00
Michael Vogel	71d3274841	Unified contact data handling	2016-06-05 13:57:11 +02:00
Tobias Diekershoff	2d280f55ac	Merge pull request #2544 from annando/issue-1769 Issue 1769: Some enhancements for sending wall mails	2016-05-30 14:35:04 +02:00
Michael Vogel	0a617da044	Wall message can now redirect to your own page if you are connected.	2016-05-29 21:29:26 +02:00
Michael Vogel	77f7619720	Issue 1769: Some enhancements for sending wall mails	2016-05-29 19:35:23 +02:00
Michael Vogel	98f7c73d10	Frio: Hovercard is now a core function	2016-05-29 15:28:31 +02:00
Sandro Santilli	10e6a243ea	Simplify openid query, and (needlessly) quote all fields Fields quoting was requested by rabuzarus	2016-05-25 16:06:16 +02:00
Sandro Santilli	b7bc428630	Fix OpenID login The problem was that while openid was stored not-normalized in the database, the checking code was looking for a normalized form instead. The commit removing normalization step on saving user preferences was `8367cad`, which might have left old users with normalized openid and new users with non-normalized one. This commit makes the checking code look for both normalized and not normalized form, to be backward compatible.	2016-05-25 12:50:09 +02:00
root	7fbb51adb9	Do not normalize openid url when logging in (since it isn't normalized when setting it via user settings) NOTE: this broke with `8367cad`	2016-05-24 22:36:51 +02:00
Michael Vogel	06998f13b6	Events: Now with guid.	2016-05-22 18:05:01 +02:00
Fabrixxm	6734aa5c28	Make user table in admin sortable via table headers new GET param for /admin/user: 'o' value is db table to order by. values are limited by script. invalid values are discarded. preped with '-' to order descending. show unicode arrows in table headers to visually indicate sorting.	2016-05-16 14:38:00 +02:00
Michael Vogel	6f72bc8d3a	Better implementation of "hidewall"	2016-05-06 11:04:21 +02:00
Michael Vogel	de431e185e	New function to update the global contact for the user id.	2016-05-05 15:08:05 +02:00
Michael Vogel	3df235e5bd	The global contact for server users is now stored directly	2016-05-05 12:02:51 +02:00
Michael Vogel	ed485b9d61	Set "hide" in noscrape	2016-05-04 23:50:31 +02:00
Michael Vogel	8992577bb6	Better handling of hidden profiles	2016-05-04 09:30:55 +02:00
Michael Vogel	26e1c4d458	Avoid SQL errors because of existing entries	2016-05-03 19:20:58 +02:00
Tobias Diekershoff	3d3cde2aed	Merge pull request #2497 from annando/1604-local-copy Copy an item to the local user if it's only available as public copy	2016-05-02 06:07:50 +02:00
Roland Haeder	738e22d3eb	Some fixes: - Letting $profile_link and $hcard always been overwritten with newly found entries has caused DFRN network detectio to fail and "connect" is no longer working. This fix makes sure that these both variables are only set if they are still empty. - added more debug lines to see which URL was it before and after webfinger "detection" Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-05-01 14:52:48 +02:00
Roland Haeder	3e701b90ac	Continued rewriting: - use dba::is_result() everywhere (where I found the old, bad way) - converted some spaces -> tabs for code - converted some CRLF -> LF as mixures of both is not good Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-05-01 14:24:44 +02:00
Roland Haeder	6177607bca	More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-05-01 13:51:48 +02:00
Roland Haeder	3448437156	More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-05-01 13:51:10 +02:00
Tobias Diekershoff	098ac5b077	count from 0	2016-05-01 13:49:58 +02:00
Tobias Diekershoff	e2c1eb34ed	installer check for XML module	2016-05-01 13:48:52 +02:00
Michael Vogel	ca98b47ee5	Remove test code	2016-05-01 13:48:52 +02:00
Michael Vogel	33436132a0	Use data from contact and gcontact prior to probe_url	2016-05-01 13:48:52 +02:00
Michael Vogel	e7c4d0bc50	Bugfix DFRN and bookmark detection	2016-05-01 13:48:52 +02:00
Michael Vogel	cea445b6f3	Check the global contacts every 90 days/Better handling in item creation	2016-05-01 13:48:52 +02:00
Michael Vogel	c69aab6ee0	Avoid write operations if not needed	2016-05-01 13:48:52 +02:00
Michael Vogel	761fa37f94	Diaspora: Comments and Likes are now signed at any time	2016-05-01 13:48:52 +02:00
Tobias Diekershoff	cc0b4ff0f9	during installation choose the highest RINO version possible	2016-05-01 13:48:52 +02:00
Michael Vogel	5efd25a0eb	Some more checks that the gcontact table contains valid data	2016-05-01 13:48:52 +02:00
Michael Vogel	468e5b9f57	Use "like" instead of "regexp" for the gcontact search	2016-05-01 13:48:52 +02:00
Michael Vogel	02808c8d12	Bugfix: ' in titles were a problem.	2016-05-01 13:48:52 +02:00
Michael Vogel	1021111241	Bugfix: Messages work now again	2016-05-01 13:48:52 +02:00
Michael Vogel	6cdcbabb3b	Use the "attachment" element instead of a mixture of several elements	2016-05-01 13:48:52 +02:00
Michael Vogel	313586e224	Speed up the contact search, proxy the images, search for addresses	2016-05-01 13:48:52 +02:00
rabuzarus	db581c08d0	rework autocomplete: some polishing	2016-05-01 13:47:24 +02:00
Michael Vogel	535f382c4e	Bugfix: "default_group" behaviour wasn't implemented correctly	2016-05-01 13:47:24 +02:00
Michael Vogel	1584f2ee00	Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore	2016-05-01 13:47:24 +02:00
Michael Vogel	94bf0e2ad8	fbrowser: Take the picture as that mostly fits	2016-05-01 13:47:24 +02:00
Tobias Diekershoff	f3cfaad70a	make en the default language	2016-05-01 13:47:24 +02:00
Tobias Diekershoff	bff7f015e0	intendation...	2016-05-01 13:47:24 +02:00
Tobias Diekershoff	fe97315acb	Issue 2241: added language selector to the admin wizard	2016-05-01 13:47:24 +02:00
Michael Vogel	761dac7ccd	issue 2247: Update more fields when relocation the server	2016-05-01 13:47:24 +02:00
Michael Vogel	4b0506879a	Post update ist now done.	2016-05-01 13:47:24 +02:00
Michael Vogel	0c6ff4202d	Bugfix: The nickname vanished/better way to fetch the alias	2016-05-01 13:47:24 +02:00
Michael Vogel	f2ce7f51cd	New OStatus implementation	2016-05-01 13:47:24 +02:00
Michael Vogel	5a90f865ed	Add the guid to items that we create locally	2016-05-01 13:47:24 +02:00
Michael Vogel	6786da1049	Take the second largest picture as preview - not the smallest one	2016-05-01 13:47:24 +02:00
Michael Vogel	8d82bf922e	The signature creation now moved into the Diaspora class. That's much cleaner.	2016-05-01 13:47:24 +02:00
Michael Vogel	07bd89c35f	Removed just more old diaspora function calls.	2016-05-01 13:46:08 +02:00
Michael Vogel	d176fff214	New implementation is now live.	2016-05-01 13:46:08 +02:00
Michael Vogel	7a0edc86ae	The display contained bad sql queries	2016-05-01 13:46:08 +02:00
rabuzarus	0e531e148e	rework autocomplete: polishing class and methods naming	2016-05-01 13:46:08 +02:00
rabuzarus	12479fb478	rework autocomplete: Access list of smilies over JSON	2016-05-01 13:46:08 +02:00
Michael Vogel	b677f63e85	Added some more explanation/now copy the whole thread	2016-05-01 09:48:05 +02:00
Michael Vogel	5fc1eebdab	Copy an item to the local user if it's only available as public copy	2016-05-01 00:19:24 +02:00
Michael Vogel	8e0b3b28da	Bugfix: The message list always showed "x and you"	2016-04-30 14:13:43 +02:00
Tobias Diekershoff	9a79b0c5f2	count from 0	2016-04-27 20:23:06 +02:00
Tobias Diekershoff	a5f4f47c41	installer check for XML module	2016-04-27 20:16:35 +02:00
Michael Vogel	cd92521c1d	Remove test code	2016-04-25 21:39:54 +02:00
Michael Vogel	1aa6c1dc5b	Use data from contact and gcontact prior to probe_url	2016-04-25 21:35:42 +02:00
Michael Vogel	93347d3279	Bugfix DFRN and bookmark detection	2016-04-24 17:00:19 +02:00
Michael Vogel	5711e561fc	Check the global contacts every 90 days/Better handling in item creation	2016-04-23 10:46:16 +02:00
Michael Vogel	ca2454eeb4	Avoid write operations if not needed	2016-04-23 00:06:34 +02:00
Tobias Diekershoff	778935eb48	Merge pull request #2471 from annando/1604-diaspora-always-on Diaspora: Comments and Likes are now signed at any time	2016-04-21 08:39:42 +02:00
Michael Vogel	e333efc9aa	Diaspora: Comments and Likes are now signed at any time	2016-04-20 23:27:33 +02:00
Tobias Diekershoff	d3293dfcf2	during installation choose the highest RINO version possible	2016-04-20 14:17:48 +02:00
Michael Vogel	28f97845ca	Some more checks that the gcontact table contains valid data	2016-04-20 07:00:55 +02:00
Michael Vogel	e1ca622b27	Use "like" instead of "regexp" for the gcontact search	2016-04-19 07:27:26 +02:00
Michael Vogel	3e76ad7793	Bugfix: ' in titles were a problem.	2016-04-18 20:57:01 +02:00
Tobias Diekershoff	a5f97b2d87	Merge pull request #2457 from annando/1604-attachments Use the "attachment" element instead of a mixture of several elements	2016-04-18 05:53:47 +02:00
Michael Vogel	0f24f2d9ae	Bugfix: Messages work now again	2016-04-17 22:07:01 +02:00
Michael Vogel	49d52faab5	Use the "attachment" element instead of a mixture of several elements	2016-04-17 20:43:41 +02:00
Michael Vogel	f8c96d24b4	Speed up the contact search, proxy the images, search for addresses	2016-04-16 15:01:03 +02:00
Tobias Diekershoff	bbd5878734	Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete new autocompletion	2016-04-16 08:16:21 +02:00
rabuzarus	ce1faf17d1	rework autocomplete: some polishing	2016-04-14 17:05:19 +02:00
rabuzarus	01b02dbcaa	Merge develop into 1404_reworked_autocomplete Conflicts: include/text.php view/templates/head.tpl view/theme/duepuntozero/style.css view/theme/vier/style.css	2016-04-14 16:23:51 +02:00
Michael Vogel	d6a79abb68	Bugfix: "default_group" behaviour wasn't implemented correctly	2016-04-13 22:21:23 +02:00
Michael Vogel	71caebdae0	Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore	2016-04-13 07:00:36 +02:00
Michael Vogel	90f5cb23f2	fbrowser: Take the picture as that mostly fits	2016-04-10 13:36:26 +02:00
Tobias Diekershoff	ac9d392264	make en the default language	2016-04-06 20:21:41 +02:00
Tobias Diekershoff	a28372c032	intendation...	2016-04-06 20:18:33 +02:00
Tobias Diekershoff	5df20fda11	Issue 2241: added language selector to the admin wizard	2016-04-06 20:13:34 +02:00
Michael Vogel	47563d34ee	Merge remote-tracking branch 'upstream/develop' into 1604-item-shadow	2016-04-03 18:46:14 +02:00
Michael Vogel	94e8139c7e	issue 2247: Update more fields when relocation the server	2016-04-03 18:18:36 +02:00
Michael Vogel	9f57425d08	Post update ist now done.	2016-04-03 16:36:05 +02:00
Michael Vogel	b4b62493e6	Bugfix: The nickname vanished/better way to fetch the alias	2016-04-02 15:41:55 +02:00
Michael Vogel	b93e1d73a1	New OStatus implementation	2016-03-30 12:43:15 +02:00
Michael Vogel	206c26ae30	Merge remote-tracking branch 'upstream/develop' into 1602-diaspora	2016-03-21 06:47:47 +01:00
Tobias Diekershoff	0bcd6886f0	Merge pull request #2419 from annando/1603-fbrowser Take the second largest picture as preview - not the smallest one	2016-03-21 06:41:48 +01:00
Michael Vogel	8f00836ffb	Add the guid to items that we create locally	2016-03-20 15:01:50 +01:00
Michael Vogel	186eaf1264	Take the second largest picture as preview - not the smallest one	2016-03-20 10:30:06 +01:00
Michael Vogel	d676ae0f32	The signature creation now moved into the Diaspora class. That's much cleaner.	2016-03-19 15:49:47 +01:00
Michael Vogel	56cb6cc897	Removed just more old diaspora function calls.	2016-03-14 20:53:44 +01:00
Michael Vogel	2841aa0281	New implementation is now live.	2016-03-13 19:47:02 +01:00
Tobias Diekershoff	e884b0e579	Merge pull request #2414 from annando/1603-display-query The display contained bad sql queries	2016-03-13 13:18:53 +01:00
Michael Vogel	99d5f8afc6	The display contained bad sql queries	2016-03-13 13:04:12 +01:00
Roland Haeder	e48c446a29	Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop	2016-03-12 23:03:06 +01:00
Roland Haeder	47b591c09a	Fixes another warning because of count()'s lazyness. #2390 Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-12 23:02:42 +01:00
Roland Haeder	a589e5a49a	Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop	2016-03-12 22:57:10 +01:00
Roland Haeder	7f0ae9843f	count() didn't notice about FALSE ... #2390 Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-12 22:54:52 +01:00
Roland Haeder	74d4f7fcd6	count() didn't notice about FALSE ... #2390 Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-12 22:54:06 +01:00
Michael Vogel	4020b51f8f	Merge pull request #2413 from tobiasd/20160312-socnetsettings missing include file for the SocNet settings	2016-03-12 19:49:03 +01:00
Roland Haeder	9cfc249b12	Moved is_filled_array() to both dba classes and named it is_result(). Please see ticket #2390 for full discussion. Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-12 18:54:55 +01:00
Roland Haeder	c60605ce0c	Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop	2016-03-12 18:50:14 +01:00
Tobias Diekershoff	2a864d889e	missing include file for the SocNet settings	2016-03-12 16:25:17 +01:00
Michael Vogel	14a2aa552a	The name in the notifications has to be double encoded	2016-03-12 09:21:13 +01:00
Michael Vogel	bc21fca345	Remove the setting description from the documentation since it isn't a hidden one anymore.	2016-03-11 23:44:46 +01:00
Michael Vogel	b12dbe8831	The worker settings are now available in the admin settings	2016-03-11 23:28:11 +01:00
fabrixxm	d30d13959b	Merge pull request #2328 from rabuzarus/0602_contact_profile polishing of the contact-edit page	2016-03-06 19:56:59 +01:00
Tobias Diekershoff	bdfd81e723	Merge pull request #2400 from annando/1603-ostatus-thread Only import OStatus threads that are started by our contacts	2016-03-06 19:40:01 +01:00
Michael Vogel	4bd1061a09	Only import OStatus threads if we follow the thread starter	2016-03-06 14:53:30 +01:00
Michael Vogel	bb06026147	Settings for only importing threads from our ostatus contacts	2016-03-06 14:09:04 +01:00
Michael Vogel	4ef33b4d5b	Clarification of description	2016-03-06 13:26:30 +01:00
Michael Vogel	8752ec11b2	Central function for default group, special setting for OStatus	2016-03-06 13:15:27 +01:00
Roland Haeder	cc4349777a	Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-04 20:05:24 +01:00
fabrixxm	3184a6263b	Merge pull request #2392 from Quix0r/minor/logging Minor: Some more logging to trace down bugs	2016-03-02 12:21:18 +01:00
Michael Vogel	ce5f6fae51	Small bugfix: Fixes problen when version number contains linebreaks	2016-03-01 19:14:45 +01:00
Roland Haeder	2d154ae72f	Closed TODO: no .= needed here. #2392 Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-01 18:31:49 +01:00
Roland Haeder	8cb011a07e	More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-01 18:31:49 +01:00
Roland Haeder	4ec377008d	Introduced is_filled_array() + added some missing array initialization Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-01 18:31:49 +01:00
Roland Haeder	7d5166c9fe	Closed TODO: no .= needed here. #2392 Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-01 18:28:06 +01:00
Roland Haeder	76b042ddee	More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-03-01 14:42:55 +01:00
Tobias Diekershoff	09060c0ed3	adding some colors to the Federation Statistics page of the admin panel	2016-02-29 17:24:34 +01:00
Michael Vogel	99bac3a4d8	Corrected explanation	2016-02-24 07:22:32 +01:00
Michael Vogel	eec0dbf738	Bugfix: Resharing on the display page works again.	2016-02-24 07:20:23 +01:00
rabuzarus	b93326bb23	contactedit-actions-button: use internal links instead of full links	2016-02-23 19:26:03 +01:00
rabuzarus	0db83b9586	contactedit-actions-button: move repair back to tabbar	2016-02-23 19:19:45 +01:00
Michael Vogel	7d4c99ebbc	"get_baseurl" and "z_root" are disappearing ...	2016-02-17 23:47:32 +01:00
Michael Vogel	c5b724828a	Just some more removed baseurls ...	2016-02-17 08:08:28 +01:00
Michael Vogel	f7537c9e90	Remove the baseurl where possible to avoid mixed content	2016-02-17 00:01:24 +01:00
Michael Vogel	7f1f549c6f	Fallback when there is no nick name	2016-02-14 15:08:49 +01:00
Michael Vogel	9261154eab	Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup	2016-02-13 20:12:31 +01:00
Tobias Diekershoff	d0b5c16a20	Merge pull request #2351 from annando/1602-performance-unread-group Optimized query for unread group postings	2016-02-13 19:43:33 +01:00
Michael Vogel	bf7dedb03b	Optimized query for unread group postings	2016-02-13 18:15:24 +01:00
Tobias Diekershoff	4ee15cc682	Merge pull request #2334 from fabrixxm/feature_autoloader Autoloader	2016-02-13 12:27:24 +01:00
Michael Vogel	2ca6cdf6b6	Improvements how gcontact entries are updated	2016-02-13 12:26:58 +01:00
Fabrixxm	89d63b2523	docs: small fixes to help sidebar	2016-02-12 09:26:42 +01:00
Tobias Diekershoff	f48a639537	Merge pull request #2341 from annando/1602-contact-bugfix Bugfix: The "keywords" field in the gcontact table wasn't set correctly	2016-02-11 07:35:32 +01:00
Michael Vogel	20d7d18379	Bugfix: The "keywords" field in the gcontact table wasn't set correctly	2016-02-10 23:39:18 +01:00
Fabrixxm	04dceb9551	Merge branch 'develop' into api_ping	2016-02-09 14:06:57 +01:00
rabuzarus	743f2e0391	Merge develop into 0602_contact_profile Conflicts: mod/contacts.php	2016-02-09 13:44:30 +01:00
Michael Vogel	7b2fadcf43	Get rid of the "guid" table. We don't need it anymore.	2016-02-09 10:21:10 +01:00
Michael Vogel	804c04a06f	Merge pull request #2326 from fabrixxm/revert_db949bb8 Revert "Updated modules to allow for partial overrides without errors"	2016-02-09 06:55:49 +01:00
rabuzarus	c1c21ada0a	contactedit-actions-button: remove contact tabs which aren't needed anymore	2016-02-08 23:51:51 +01:00
rabuzarus	0c764684bb	Merge develop into 0602_contact_profile	2016-02-08 23:16:02 +01:00
rabuzarus	0b5d7b300e	contactedit-actions-button: adjust the themes and template polishing	2016-02-08 23:15:20 +01:00
fabrixxm	0c67c89715	Merge pull request #2323 from annando/1601-dfrn-import Complete rewrite of DFRN import	2016-02-08 15:48:16 +01:00
rabuzarus	cc18fd7ad9	contactedit-actions-button: doing some availability checks for the actions	2016-02-08 15:00:53 +01:00
rabuzarus	991cbd604a	contact-edit-actions-button: initial commit	2016-02-08 01:56:15 +01:00
fabrixxm	b202e02fbf	Revert "Updated modules to allow for partial overrides without errors" This reverts commit `db949bb802`.	2016-02-07 15:11:34 +01:00
fabrixxm	44592611e1	new api for notifications /api/friendica/notification returns first 50 notifications for current user /api/friendica&notification/<id> set note <id> as seen and return item object if possible new class NotificationsManager to query for notifications and set seen state	2016-02-07 14:27:13 +01:00
fabrixxm	9330a6994c	Merge pull request #2319 from stieben/develop Added the possibility for themes to override core module functions	2016-02-07 09:52:20 +01:00
Andrej Stieben	db949bb802	Updated modules to allow for partial overrides without errors Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.	2016-02-05 21:52:39 +01:00
Michael Vogel	d408cea871	DFRN import has now gone live	2016-02-05 21:25:20 +01:00
rabuzarus	30c375d238	rework autocomplete: polishing class and methods naming	2016-02-05 14:26:22 +01:00
rabuzarus	52dbb0b4a2	Forum class - rename Class CamelCase and rename some methods	2016-02-04 14:51:54 +01:00
rabuzarus	9a54afa629	Forum class - rename Class CamelCase and rename some methods	2016-02-04 14:47:20 +01:00
rabuzarus	c1070e4655	forums.php is now forum.php and providing class forum	2016-02-03 18:05:26 +01:00
rabuzarus	5f7c5e6ab6	rework autocomplete: Access list of smilies over JSON	2016-02-01 17:43:12 +01:00
Michael Vogel	d04e1bdf69	Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import	2016-01-30 16:38:06 +01:00
Michael Vogel	69457a4a5b	DFRN import seems to work. Improvements are possible :-)	2016-01-30 02:57:40 +01:00
Michael Vogel	596416defe	Profile data from the gcontact should only be taken if there is content	2016-01-29 12:14:04 +01:00
Michael Vogel	845a769dc2	Only check size if needed - should speed up the uploading.	2016-01-28 12:28:04 +01:00
Michael Vogel	04725d1283	Reverted some work ...	2016-01-28 11:14:13 +01:00
Michael Vogel	78e79de7c9	New central function to store avatar data in contacts	2016-01-28 11:09:08 +01:00
Michael Vogel	6f662b8c74	New avatar picture fields to better cope with changing avatars	2016-01-28 01:26:19 +01:00
Michael Vogel	d3bf80a1f3	Show contact posts by searching for "contact-id" - not "gcontact-id"	2016-01-27 11:16:56 +01:00
Michael Vogel	4208acf4b6	Merge remote-tracking branch 'upstream/develop' into 1601-dfrn	2016-01-25 23:51:11 +01:00
Michael Vogel	62de6be495	Switched to static methods for DFRN	2016-01-25 15:20:58 +01:00
Matthew Exon	2aa0c6d00d	Only proxy URLs using HTTP or HTTPS	2016-01-25 02:50:57 +01:00
Michael Vogel	937196d6ee	Poco fields now moved to the header, function to create formatted location string	2016-01-24 14:30:57 +01:00
Michael Vogel	74ed37aa87	Some more removed code	2016-01-24 00:21:58 +01:00
Michael Vogel	7371318376	Merge remote-tracking branch 'upstream/develop' into 1601-dfrn	2016-01-23 18:50:14 +01:00
Tobias Diekershoff	39099b56d1	a total number count would be nice	2016-01-23 08:01:54 +01:00
Michael Vogel	444b417de0	New routines are now enabled	2016-01-23 02:44:30 +01:00
Michael Vogel	c66b4387bf	dfrn functions could now work/Removed unused code	2016-01-22 20:26:11 +01:00
Tobias Diekershoff	080319d82d	issue #2270	2016-01-20 17:52:58 +01:00
Fabrixxm	7e83ba090f	Merge branch 'hotfix_diaspora' into develop	2016-01-20 08:50:18 +01:00
Michael Vogel	c6b0e57aa4	Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change	2016-01-20 08:40:04 +01:00
Tobias Diekershoff	f4a65cf6ca	some more doc strings	2016-01-19 09:15:32 +01:00
Michael Vogel	32c7896c5d	Merge remote-tracking branch 'upstream/develop' into 1601-network-performance	2016-01-18 18:49:04 +01:00
Tobias Diekershoff	2ef63b6593	Merge pull request #2262 from annando/1601-http-timeouts Timeout problems while fetching image data	2016-01-18 18:34:15 +01:00
Michael Vogel	5ec2c7e965	When a server isn't reachable there were timeout problems with fetching image data	2016-01-18 15:38:38 +01:00
Tobias Diekershoff	c243087b89	readd plugin features to admin aside	2016-01-18 13:04:25 +01:00
Michael Vogel	6c7cf2a766	Merge remote-tracking branch 'upstream/develop' into 1601-network-performance	2016-01-18 00:53:18 +01:00
rabuzarus	78e282734f	feature management for admins: delete double entries from merging process	2016-01-17 12:59:06 +01:00
rabuzarus	c1ed2bd975	feature management for admins: Merge branch 'devolop'	2016-01-17 03:25:17 +01:00
Michael Vogel	228ce9e27e	Merge remote-tracking branch 'upstream/develop' into 1601-network-performance	2016-01-16 17:39:45 +01:00
Michael Vogel	8b90e5c077	Removed unused functionality	2016-01-16 14:46:00 +01:00
Tobias Diekershoff	1770267934	move @brief to the top of the doc block	2016-01-16 14:12:55 +01:00
Tobias Diekershoff	8730c72156	removed commented out code, beautification of MySQL statements	2016-01-16 13:45:21 +01:00
Tobias Diekershoff	7f80de6db8	removed calls to the remote_update funcions	2016-01-16 12:45:48 +01:00
Tobias Diekershoff	20fe67f378	removed remote update functionality from admin panel	2016-01-16 11:52:21 +01:00
Michael Vogel	90a8d6f0f5	Several performance improvements	2016-01-15 23:27:25 +01:00
Tobias Diekershoff	954e4f2754	more docs	2016-01-15 20:40:01 +01:00
Tobias Diekershoff	11aa76c270	Theme listing works again, added some docs for theme and plugin listing funkctions	2016-01-15 20:03:41 +01:00
Tobias Diekershoff	7a7ffb2299	issue 2240 when no addon are installed hint the location of sources in the admin panel	2016-01-15 18:19:22 +01:00
Tobias Diekershoff	e3fd0a269b	some doc strings, sort platforms for federation stats page	2016-01-15 18:19:22 +01:00
Tobias Diekershoff	1030c5f4b6	some doc texts	2016-01-15 18:19:21 +01:00
Tobias Diekershoff	4d1545a1a9	viewing and configuration of logs are now on separate subpages in the admin panel	2016-01-15 18:19:21 +01:00
Tobias Diekershoff	8b189aca9e	some doxygen stuff	2016-01-15 18:19:20 +01:00
Tobias Diekershoff	0905f18c0f	allow -rc in friendica version listings	2016-01-15 18:19:20 +01:00
Tobias Diekershoff	ce39992875	combine some versions for ~f and D*	2016-01-15 18:19:20 +01:00
Tobias Diekershoff	25bb977b87	better names for some variable to reflect their intention	2016-01-15 18:19:20 +01:00
Tobias Diekershoff	a4104d7c17	1st stuff for federation stats in the admin panel	2016-01-15 18:19:19 +01:00
Michael Vogel	268467fe04	Add the creation date to the cache tables	2016-01-15 00:58:57 +01:00
Michael Vogel	d5e1f33506	OEmbed and parse_url are now cached in dedicated tables	2016-01-14 23:59:51 +01:00
Michael Vogel	01c2eacd46	Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total	2016-01-11 14:25:48 +01:00
Tobias Diekershoff	bfdbc0c818	don't mention FB in newhere tipps	2016-01-11 07:54:52 +01:00
Michael Vogel	6b85fa17bb	Added some documentation	2016-01-10 19:06:34 +01:00
Michael Vogel	b4631cebed	Fixed SQL problems	2016-01-10 17:10:56 +01:00
Michael Vogel	23731fc9aa	Bugfix: The display hadn't fetched the correct contact for the uid.	2016-01-10 15:44:23 +01:00
Michael Vogel	2f49e984bd	Updated database.sql file, further code cleanup	2016-01-10 14:12:05 +01:00
Michael Vogel	214f381e81	Code cleanup	2016-01-10 12:37:49 +01:00
Michael Vogel	885dc1df81	gcontact update script, rebuilt follow page, query speedup for community and network groups	2016-01-10 09:19:00 +01:00
Michael Vogel	6703ba468a	Profile data in gcontact overwrites profile data	2016-01-08 08:02:42 +01:00
Michael Vogel	358a9fd6fd	Notify and alias will be fetched via OStatus	2016-01-08 00:35:46 +01:00
Michael Vogel	9521cdc18f	notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed	2016-01-07 23:43:16 +01:00
Michael Vogel	fdb31abdfa	Use gcontact when adressing contacts in editor	2016-01-07 08:19:28 +01:00
Michael Vogel	5ab2786c00	Get rid of the table "unique_contacts"	2016-01-06 22:23:12 +01:00
Michael Vogel	2bad2cdd91	More fields in gcontact, contact search respects "hide" setting	2016-01-06 14:13:59 +01:00
Michael Vogel	75e2ec01fe	The gcontact will now be connected to the items	2016-01-05 15:34:27 +01:00
fabrixxm	fcf7a791f1	Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" This reverts commit `83e54f70d3`, reversing changes made to `ecf576bdd0`.	2016-01-04 11:46:19 +01:00
fabrixxm	83e54f70d3	Merge pull request #2223 from rabuzarus/2912_photo_widget photo aside widget for profile page	2016-01-04 10:06:07 +01:00
Tobias Diekershoff	75ed2f830d	moved include Scape to top of the file	2016-01-03 19:15:13 +01:00
rabuzarus	29c671bb22	photos aside widget:permissions cleanup	2016-01-03 16:09:05 +01:00
rabuzarus	1ab022f4df	photos aside widget: move dependencies to the header	2016-01-03 15:45:02 +01:00
Michael Vogel	2ed3ae1aab	Bugfix: The request process from DFRN hadn't worked anymore since the last pull request	2016-01-01 17:49:07 +01:00
rabuzarus	20fbf670db	photo aside widget for profile page	2015-12-30 00:26:50 +01:00
Tobias Diekershoff	99861b9fa6	Merge pull request #2216 from fabrixxm/feature-api-like Works on API and a small refractor, updated docs	2015-12-28 18:39:21 +01:00
Tobias Diekershoff	03000beac6	Merge pull request #2219 from fabrixxm/quattro Fix video oembed appearance	2015-12-28 18:39:03 +01:00
fabrixxm	a1c1a6cae8	workaround for media.ccc.de oembed with size 0	2015-12-28 18:28:02 +01:00
Michael Vogel	2f13506180	Bugfix: The participants on the mail page were displayed wrong	2015-12-28 18:13:03 +01:00
fabrixxm	f579b2af55	Fix TOC links href, no TOC in home	2015-12-28 10:24:47 +01:00
fabrixxm	1776b19dbf	Add table of content in aside of help pages	2015-12-28 10:24:47 +01:00
fabrixxm	f27fad7b47	Move Like/Dislike/Attend add/remove code to include/like.php	2015-12-28 10:23:06 +01:00
fabrixxm	cf86162a08	Merge pull request #2214 from rabuzarus/2612_db_docu add db documentation to the help pages	2015-12-28 10:22:33 +01:00
Tobias Diekershoff	497175c56e	Merge pull request #2213 from annando/1512-dfrn-request Support for remote subscription in Diaspora	2015-12-28 05:25:50 +01:00
Tobias Diekershoff	b09fd2c39e	Merge pull request #2212 from annando/1512-xrd XRD now should react more like an OStatus server	2015-12-28 05:24:36 +01:00
rabuzarus	038611bcb4	add documentation	2015-12-28 03:17:55 +01:00
Michael Vogel	72f7ee7fd3	Support for remote subscription in Diaspora	2015-12-28 03:14:38 +01:00
Michael Vogel	8b25f51116	XRD now should react more like an OStatus server	2015-12-28 01:04:14 +01:00
Michael Vogel	435a29026d	Diaspora: The /p/ only should return top level posts - not comments	2015-12-27 21:12:53 +01:00
Tobias Diekershoff	bc9c3d80fa	typos in OStatus (re)subscribing	2015-12-27 08:44:23 +01:00
rabuzarus	7530c950e3	help - make use of subfolders	2015-12-26 16:06:38 +01:00
rabuzarus	3df5c17124	reformat todo according to doxygen style	2015-12-25 23:17:34 +01:00
rabuzarus	2cf1aaa791	add pager to common friends and allfriends	2015-12-15 14:31:24 +01:00
Michael Vogel	d077dbbcde	Bugfix: The bbcode conversion of the profile was inconsistent	2015-12-14 23:53:35 +01:00
rabuzarus	e61d6e030e	fix account_type	2015-12-14 14:12:56 +01:00
Tobias Diekershoff	c0c0d62a2e	Merge pull request #2173 from annando/1512-optimize-fragmentation There is now a fragmentation level for the table optimization	2015-12-13 08:32:03 +01:00
Michael Vogel	5a1041578c	Bugfix: The subscribe process took the own contact by random ...	2015-12-12 17:55:57 +01:00
Michael Vogel	ec9b1b7afd	There is now a fragmentation level for the table optimisation	2015-12-12 17:46:24 +01:00
Michael Vogel	0869cce45f	Code cleaning, real changes will follow	2015-12-12 17:41:25 +01:00
rabuzarus	f513b25f6f	fix directory search	2015-12-12 01:27:31 +01:00
Michael Vogel	300007a0cf	Bugfix: Posts weren't always shown for feeds that start with "www."	2015-12-10 22:47:58 +01:00
Johannes Schwab	2f866fecf9	fix path for photo and proxy	2015-12-08 11:31:50 +01:00
Tobias Diekershoff	d944b65253	Merge pull request #2151 from annando/1512-misconfigured-friendica Workaround for misconfigured Friendica servers with probe_url	2015-12-07 06:37:37 +01:00

... 12 13 14 15 16 ...

4222 commits