friendica

Author	SHA1	Message	Date
Hypolite Petovan	7d9d22914f	Refactor "URL" to "domain" for blocklist - Add slash trimming to domain - Reformatted mod/friendica	2017-04-25 22:45:42 -04:00
Hypolite Petovan	0b8f80c747	Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel blocklist front end for the admin panel	2017-04-25 21:23:20 -04:00
Tobias Diekershoff	f146c85e75	standards	2017-04-25 18:57:50 +02:00
Michael	efcb166c2d	Added check for MySQL driver for PDO.	2017-04-25 06:10:14 +00:00
Michael	49ba2f9d6d	Added a PDO check in the install routine and cleaned it up	2017-04-25 05:55:20 +00:00
Hypolite Petovan	82ea7ead66	Merge pull request #3374 from rabuzarus/20170407_-_group_edit Frio: provide own group template + some restructuring in group.php	2017-04-24 19:50:46 -04:00
Tobias Diekershoff	eeb72bd879	docstrings for the admin panel functions	2017-04-24 23:47:05 +02:00
Tobias Diekershoff	f969f44603	added subpage for blocklist management to the admin panel	2017-04-24 23:45:05 +02:00
Tobias Diekershoff	7f837a9205	add the contents from the blocklist to the /friendica page	2017-04-24 23:43:39 +02:00
Hypolite Petovan	bc2dd690fd	Merge pull request #3386 from rabuzarus/20170422_-_Stream_content_update_2 improve profile page (wall) update for non logged in users and remote users	2017-04-23 21:43:27 -04:00
rabuzarus	88602de604	fall back to unseen items if no timestamp is available	2017-04-23 16:22:53 +02:00
Sandro Santilli	cd521b2dcc	Urlencode query parameters	2017-04-23 13:50:33 +02:00
Sandro Santilli	ebc926a716	Add missing query string introducing character Fixes #3383	2017-04-23 13:50:18 +02:00
Michael	2628ff91f4	Call it "toinnodb"	2017-04-22 21:55:16 +00:00
Michael	aaa558f7ea	New command in dbstructure.php to convert all tables from MyISAM to InnoDB	2017-04-22 21:36:01 +00:00
rabuzarus	5a7b9676ff	fixed typo	2017-04-22 22:10:43 +02:00
rabuzarus	53c1bf6ba3	improve profile update for non logged in ussers and remote users	2017-04-22 22:08:05 +02:00
rabuzarus	b273165873	Remove unused function	2017-04-21 16:13:16 +02:00
rabuzarus	f99bb958f6	Merge develop into 20170407_-_group_edit Conflicts: mod/group.php	2017-04-21 16:09:48 +02:00
rabuzarus	40e5436604	some restructuring in groups.php + Frio: provide own group template	2017-04-21 16:04:29 +02:00
Alexandre Alapetite	5b80a1fcaa	mod photos compatibility only_full_group_by Related to https://github.com/friendica/friendica/pull/3323	2017-04-20 21:23:45 +02:00
Michael	3592f90910	Merge remote-tracking branch 'upstream/develop' into 1704-mastodon Conflicts: include/bbcode.php	2017-04-20 05:44:31 +00:00
Michael Vogel	83cc56e713	Merge pull request #3326 from Alkarex/utf8mb4 Default to utf8mb4	2017-04-20 05:28:16 +02:00
Michael	e16fb74b0c	Reworked OStatus communication part to better support Mastodon.	2017-04-19 21:37:00 +00:00
Hypolite Petovan	2c69d36886	Remove extra htmlentities in notifications	2017-04-18 19:34:46 -04:00
Michael	33d5e5b818	Issue 3157: No fulltext anymore	2017-04-18 20:09:05 +00:00
Michael	47fd9226c3	Resubmit all profiles on directory change	2017-04-17 21:39:11 +00:00
Alexandre Alapetite	d1888ac05c	SQL AS for messages Fix bug introduced in https://github.com/friendica/friendica/pull/3323	2017-04-17 15:01:05 +02:00
Alexandre Alapetite	07faa14361	Merge branch 'develop' into utf8mb4	2017-04-16 22:08:48 +02:00
Alexandre Alapetite	a2a03c3f70	Default UTF8MB4 for CREATE DATABASE	2017-04-16 16:04:38 +02:00
Alexandre Alapetite	c35eef625a	More general date test for dob	2017-04-16 15:36:01 +02:00
Alexandre Alapetite	6b250d3ae9	Merge branch 'develop' into MySQL5.7	2017-04-16 15:16:58 +02:00
Alexandre Alapetite	d076b39b64	Forgotten AS in mod/admin patch	2017-04-15 23:48:02 +02:00
Alexandre Alapetite	8b3f623d29	ANY_VALUE in mod/admin The query was not standard, not deterministic, and was not doing what its description says. The patch makes it more standard and a bit more deterministic. The returned protocol type is still undeterministic.	2017-04-15 23:42:10 +02:00
Alexandre Alapetite	d2b3e0daf5	Merge develop	2017-04-15 01:03:21 +02:00
Alexandre Alapetite	6be6badd91	SQL typo mod/message Mistake in previous commit	2017-04-15 00:45:30 +02:00
Alexandre Alapetite	1058b28cea	MySQL ANY_VALUE with fallback to MIN https://github.com/friendica/friendica/issues/3322	2017-04-15 00:42:44 +02:00
Tobias Diekershoff	b8fd48dddc	Merge pull request #3335 from annando/issue-3331 Issue 3331: Remove unneeded table "deliverq"	2017-04-14 07:32:30 +02:00
Michael Vogel	79e827417c	Merge pull request #3319 from Hypolite/issue/#3316 Use get_contact_by_url for unknown contacts in acl_lookup	2017-04-14 07:24:27 +02:00
Pierre Rudloff	ead9cbe534	Web app manifest (fixes #3317 )	2017-04-13 16:46:36 +02:00
Michael	d82684219a	Issue 3331: Removed unneeded table "deliverq"	2017-04-13 04:51:16 +00:00
Alexandre Alapetite	38e7a0f793	Fix GROUP BY for search https://github.com/friendica/friendica/issues/3322 Fix MySQL ERROR 1055 (42000): Expression #1 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'friendica.item.author-id' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by	2017-04-12 22:55:02 +02:00
Alexandre Alapetite	534ea6aefc	Fix ping_init SQL According to review https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628	2017-04-12 18:54:54 +02:00
Alexandre Alapetite	9fb4ba2b73	Fix profile wrong DISTINCT + ORDER BY Fix: ERROR 3065 (HY000) Expression #1 of ORDER BY clause is not in SELECT list, references column 'friendica.item.created' which is not in SELECT list; this is incompatible with DISTINCT	2017-04-12 18:49:29 +02:00
Alexandre Alapetite	74b6d09e89	Fix GROUP BY in acl_selector, api, notifier, photos, messages https://github.com/friendica/friendica/issues/3322	2017-04-12 15:11:50 +02:00
Alexandre Alapetite	c3e933642e	Fix missing SQL group by in ping https://github.com/friendica/friendica/issues/3322	2017-04-12 14:17:16 +02:00
Alexandre Alapetite	d2901dcb00	Fix for MySQL 5.7+ https://github.com/friendica/friendica/issues/2786 Only tested on Ubuntu 16.10 with MySQL 5.7.17. https://dev.mysql.com/doc/refman/8.0/en/timestamp-initialization.html https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_no_zero_date As of MySQL 5.7.4, NO_ZERO_DATE is deprecated. Patch based on the following search & replace (and then reverting some changes in libraries): ```sh grep -l '= "0000-00-00"' -r . \| xargs sed -i -e "s/= \"0000-00-00\"/= '0000-00-00'/g" grep -l "0000-00-00" -r . \| xargs sed -i -e "s/0000-00-00/0001-01-01/g" grep -l "!= '0001-01-01'" -r . \| xargs sed -i -e "s/!= '0001-01-01'/> '0001-01-01'/g" grep -l " === '0001-01-01'" -r . \| xargs sed -i -e "s/ === '0001-01-01'/ <= '0001-01-01'/g" grep -l " == '0001-01-01'" -r . \| xargs sed -i -e "s/ == '0001-01-01'/ <= '0001-01-01'/g" grep -l "strpos(\$dob, '0000-') === 0" -r . \| xargs sed -i -e "s/strpos(\$dob, '0000-') === 0/strpos(\$dob, '0000-') === 0 \|\| strpos(\$dob, '0001-') === 0/g" grep -l 'array("", "0001-01-01")' -r . \| xargs sed -i -e 's/array("", "0001-01-01")/array("", "0000-00-00", "0001-01-01")/g' grep -l "\$dob = '0000-'" -r . \| xargs sed -i -e "s/\$dob = '0000-'/\$dob = '0001-'/g" ```	2017-04-11 23:00:45 +02:00
Hypolite Petovan	05a5e1792d	Left trim at sign from nicks in ACL	2017-04-10 22:09:49 -04:00
Hypolite Petovan	ffbf330585	Merge pull request #3310 from annando/1704-probing Avoid possible problems with numeric nicknames and GNU Social	2017-04-09 01:08:12 -04:00
Michael	5c75fe4c14	Avoid possible problems with numeric nicknames and GNU Social	2017-04-09 04:29:02 +00:00
Hypolite Petovan	472345d740	Merge branch 'develop' into space_before_t	2017-04-08 23:17:31 -04:00
rabuzarus	6338636ff3	short test with array	2017-04-08 23:46:59 +02:00
rebeka-catalina	050675a629	The other lone comma in 1177	2017-04-08 18:07:30 +02:00
rebeka-catalina	554704e6b9	Added a whitespace between comma and t()	2017-04-08 16:57:24 +02:00
rebeka-catalina	d8a8fa9baa	Modified the warning message	2017-04-08 16:48:11 +02:00
rebeka-catalina	7320327fa1	Deleted the lone comma between paratheses	2017-04-08 16:37:18 +02:00
rebeka-catalina	895a6254a0	Correction of 1177 and added modification to 1171	2017-04-08 15:48:15 +02:00
rebeka-catalina	bcfbfeeba4	adding space for readability	2017-04-08 13:52:37 +02:00
rebeka-catalina	4c9c83e8e8	Warning, that profile published in local directory may be visible in public	2017-04-08 13:21:35 +02:00
rebeka-catalina	892ef45474	Warning, that profile published in local directory may be visible in public	2017-04-08 13:13:38 +02:00
Hypolite Petovan	cfb99aa323	Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser frio: fbrowser styling	2017-04-07 00:01:46 -04:00
Michael	407e25e7d6	Some little standard stuff	2017-04-04 05:39:43 +00:00
Michael	a0216af4bb	Issue 1720: Group filter and new tab don't like each other	2017-04-04 05:35:04 +00:00
rabuzarus	ee293f2ce2	Merge develop into 20170321_-_frio-fbbrowser Conflicts: view/theme/frio/js/filebrowser.js view/theme/frio/js/theme.js view/theme/frio/templates/filebrowser.tpl view/theme/frio/templates/jot.tpl	2017-04-03 00:51:34 +02:00
Roland Häder	49527b70d3	Merge branch 'develop' into rewrites/coding-convention-split2	2017-04-01 22:16:08 +02:00
Roland Haeder	3cea176ef2	added spaces + used x () Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-01 22:12:53 +02:00
Michael	240a0961c6	Standards ...	2017-04-01 17:08:11 +00:00
Michael	f6d7ee2781	Issue 3142: mcrypt is no more (as well as phpseclib)	2017-04-01 08:28:42 +00:00
Roland Haeder	60552260e1	Continued with CR: - added spaces as requested - removed parentheses from include/require calls as they are no functions Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 21:04:39 +02:00
Roland Haeder	d4e67338d8	space-time contines ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:56:43 +02:00
Roland Haeder	18ca141f5c	space-time! Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:52:43 +02:00
Roland Haeder	44a137a8de	Continued a bit: - converted multiple single-line comments into one multi-line comment - added spaces (space-time!) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:51:47 +02:00
Roland Haeder	07a0d300c3	added space, marked rest 86 occurrences in todos.txt Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:49:58 +02:00
Roland Haeder	9cfcf8f7ca	added spaces, marked in todos.txt as usual Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:47:44 +02:00
Roland Haeder	eab654dd65	$tagged is being initialized but not written to until the foreach() loop is being executed. Maybe here is old-lost code anyway? Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:45:15 +02:00
Roland Haeder	8824da8962	Continued a bit: - recommended way is to use foreach() instead of own looping through arrays - even when you need the index: <?php foreach ($someArray as $key => $value) { // Handle $key/$value somehow } ?> Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:37:01 +02:00
Roland Haeder	6db3d72ee3	added spaces (space-time!) and TODO that x() is maybe proper way? Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:33:11 +02:00
Roland Haeder	d98ac6b42d	Continued a bit: - removed parentheses from include/require as they are no functions - added type-hint for $a which is unused btw. Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-31 20:31:00 +02:00
Roland Haeder	0bc15efef6	whoops, parser error fixed Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:51:42 +02:00
Roland Haeder	192f6d7cf4	merged 2 if() into one three times Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:49:03 +02:00
Roland Haeder	de5125a4c7	merged 2 if() into one as requested by CR Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:45:49 +02:00
Roland Haeder	2a480df6fa	added spaces + removed parentheses (include/require are no functions) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:44:55 +02:00
Roland Haeder	6b8f581897	added spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:42:09 +02:00
Roland Haeder	f998438d43	removed old-lost code by CR request Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:38:36 +02:00
Roland Haeder	5bc2ebb267	Please use x() correctly: <?php if (x($someArray, 'element')) { // Do something } ?> Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:37:08 +02:00
Roland Haeder	3d595c4dcc	Continued a bit: - added spaces / curly braces - converted multiple single-line comments into one multi-line comment - used more dbm::is_result() - include/require are no functions, let's not abuse them ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 21:33:24 +02:00
Roland Haeder	d091759888	space to the rescue ... ;-) CR request Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 20:34:14 +02:00
Roland Haeder	9c056d0bf0	it is ... SPACE TIME! ;-) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 20:30:35 +02:00
Roland Haeder	e0f4d22049	removed old-lost code by CR request + spaces added ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-30 20:26:50 +02:00
Hypolite Petovan	55e4bab00e	Improve babel page display for diaspora2bb mode - Fix formatting	2017-03-26 19:06:22 -04:00
Michael	8fe1fc2f52	Remove parendingsdas	2017-03-26 13:12:02 +00:00
Michael	92f5315320	We now return basic system data via nodeinfo at every time.	2017-03-26 12:51:25 +00:00
Michael	4168d47ecd	Issue 3248: Make communityhome work again.	2017-03-26 05:29:24 +00:00
rabuzarus	b6ab3bdd36	make use of Config class	2017-03-25 21:07:12 +01:00
Hypolite Petovan	f1a75a57fe	Merge pull request #3257 from annando/1703-gcontact Improved gcontact handling	2017-03-25 15:35:41 -04:00
rabuzarus	a2ad013830	some work on code standards compliance	2017-03-25 19:12:16 +01:00
Roland Haeder	0e6b009425	fixed another parser error, opps Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 15:04:07 +01:00
Roland Haeder	fccdc63964	Opps, fixed parser error. indending was confusing here + added much more curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 14:56:23 +01:00
Roland Haeder	73ee285212	rewrote for() loop to foreach() + added curly braces/spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 14:33:59 +01:00
Roland Haeder	006b4b88b2	Continued: - added curly braces/spaces - converted multiple single-line comments into one multi-line comment Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 14:07:59 +01:00
Roland Haeder	177a0c8320	Continued: - used dbm::is_result() to avoid E_WARNING when false is returned - added curly braces + some spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:23:15 +01:00
Roland Haeder	e503141b0c	added spaces and curly braces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:18:39 +01:00
Roland Haeder	67707247c8	Continued: - added curly braces/spaces - changed lower-case SQL keywords to upper-case - used dbm::is_result() instead of count() (avoids warning in case of false is returned) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:15:42 +01:00
Roland Haeder	c1287df655	removed old-lost code + internal TODO closed Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:12:41 +01:00
Roland Haeder	2f5c796886	removed TODO, one day this all needs refacturizing ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 13:02:09 +01:00
Roland Haeder	506af8b556	changed "and" -> && according to CR Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-25 12:47:47 +01:00
Michael	0d49143a63	"no_utf" wasn't in use anymore - it is now removed completely	2017-03-25 10:51:00 +00:00
Hypolite Petovan	29fb28de43	Remove Embedly integration - Remove admin setting input	2017-03-25 01:57:19 -04:00
Roland Haeder	239dfea4e6	it is space-time! ;-) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 22:40:33 +01:00
Roland Haeder	caad9f5214	added more spaces (CR request) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 22:36:52 +01:00
Roland Haeder	be717649a4	added more curly braces/spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 22:34:13 +01:00
Roland Haeder	c0be733d6d	Opps, became lazy here, thanks to @Hypolite finding it. Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 21:15:36 +01:00
Roland Haeder	b5b3451b31	Continued: - marked commented-out code as possible old-lost - added more curly braces - used more dbm::is_result() where SELECT is stated - ! added quotes in array element, else (here) >thumb< (without quotes) is considered as a constant and causes an E_NOTICE Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-24 20:57:52 +01:00
Roland Haeder	c4b82133e9	added more curly braces + spaces for #3254 Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 23:06:28 +01:00
Roland Haeder	16c405b387	more spaces added (CR by @Hypolite) Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-23 22:22:41 +01:00
Michael	1d6910277d	Remove more deprecated "poco_check" calls	2017-03-22 07:11:58 +00:00
rabuzarus	835e54dfc3	upload images to the selected album	2017-03-21 23:08:37 +01:00
Roland Häder	830af774d3	added more curly braces + a bit more usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-21 21:50:45 +01:00
Hypolite Petovan	7b352f3f74	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
Roland Haeder	09851331a9	Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-20 20:51:32 +01:00
rabuzarus	0557a42e2f	add missed NULL_DATE	2017-03-20 17:19:24 +01:00
rabuzarus	0879b46125	add NULL_DATE & coding standard work	2017-03-20 16:59:21 +01:00
rabuzarus	0060e2449e	Merge develop into 20170316_-_fix_event_edit Conflicts: mod/events.php	2017-03-20 16:46:36 +01:00
Michael	24ee60492b	If the maintenance reason is a url, then redirect to this address	2017-03-19 19:03:09 +00:00
Hypolite Petovan	65f809f5cb	Merge pull request #3245 from annando/issue-3242 Issue 3242: Define a maintenance reason	2017-03-19 11:06:25 -04:00
Michael	8dd732a896	Issue 3242: Define a maintenance reason	2017-03-19 13:24:07 +00:00
Michael	132688d663	Standards, what else?	2017-03-19 08:04:04 +00:00
Roland Haeder	621a77b275	added spaces around + curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 00:58:46 +01:00
Roland Häder	4fe5cdf3fd	don't quit silently, at least a TODO is now around Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:37 +01:00
Roland Häder	d529125c8e	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:24 +01:00
Roland Häder	aeb0ed32c8	added curly braces + removed more useless intval() calls on file_exists() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	fef61a28cc	fixed chmod Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	d9c22c7f3e	Continued a bit: - converted some else if to elseif (only PHP) - converted some space -> tab (intending) Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	0cd241bcbe	added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:44:40 +01:00
Roland Häder	5f71da5862	added more curly braces + spaces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +01:00
Roland Häder	958c24e9f3	spaces -> tab + added spaces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:41:00 +01:00
Roland Häder	3849e7c9ff	added more curly braces + a bit more usage of dbm::is_result() Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:47 +01:00
Roland Häder	5471dd79e8	added missing curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:21 +01:00
Roland Häder	63e4750b4a	more coding convention applied: - added curly braces - added spaces where needed - $r only needs to be tested with dbm::is_result() - made SQL keywords all uper-case Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:21 +01:00
Roland Häder	1c6535c0b4	applied coding convention: - replaced space -> tab (code indenting) - added curly braces - used dbm::is_result() if $r is no result (may happen) Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:40:21 +01:00
Michael	1a436264cd	Some standards	2017-03-18 12:13:43 +00:00
Michael	62ccb4499a	Some more unneeded changes reverted	2017-03-18 08:54:25 +00:00
Michael	a2a171af06	"dob" is not a date field, so the changes are reverted	2017-03-18 08:50:27 +00:00
Michael	e301fa0832	Merge remote-tracking branch 'upstream/develop' into 1702-null-date	2017-03-18 08:31:43 +00:00
rabuzarus	497df57ef7	more standards work	2017-03-18 04:41:54 +01:00
rabuzarus	e1d22ef5d4	some code cleanup	2017-03-17 19:10:48 +01:00
rabuzarus	c785eb29c6	more work on standards compliance	2017-03-17 17:57:57 +01:00
Michael	87771cf617	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server Conflicts: include/discover_poco.php	2017-03-17 15:53:19 +00:00
rabuzarus	3cef98caf6	Merge pull request #3226 from annando/1702-only-worker The worker is now the only background processing system	2017-03-17 13:22:23 +01:00
rabuzarus	8ae8465d48	add dop event & fix event edit	2017-03-16 20:15:25 +01:00
Michael	88a69b93d5	Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server	2017-03-15 13:56:17 +00:00
Michael	8decd15565	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-15 13:55:43 +00:00
Michael Vogel	a7e8e86800	Merge pull request #3221 from strk/remember-openid Fix "remember me" cookie for OpenID logins	2017-03-14 16:30:15 +01:00
fabrixxm	fa3490ba5b	Merge pull request #3224 from annando/1702-no-old_pager The old pager is now removed	2017-03-14 10:29:03 +01:00
Michael	eaf93dc041	I guess, @Hypolite will still find something to change ...	2017-03-13 17:23:02 +00:00
Michael	0dbc72c4ea	Embrace the braces and spaces ...	2017-03-13 16:18:45 +00:00
Michael	d2bad13e83	Added documentation	2017-03-13 14:57:11 +00:00
Michael	fbb84ee219	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-13 10:18:29 +00:00
Tobias Diekershoff	dfc5dc2e9e	Merge pull request #3223 from annando/1702-no-language The language string isn't displayed anymore	2017-03-13 08:26:43 +01:00
Michael	eb6a6228f7	more spaces	2017-03-13 05:57:37 +00:00
Michael	77e8c44016	Merge remote-tracking branch 'upstream/develop' into 1702-only-worker Conflicts: include/onepoll.php include/queue.php	2017-03-12 21:03:44 +00:00
Michael	1624150db4	Merge remote-tracking branch 'upstream/develop' into 1702-null-date Conflicts: include/onepoll.php	2017-03-12 20:54:28 +00:00
Michael	259598e569	Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share	2017-03-12 20:52:48 +00:00
Michael	044e9a6603	Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager Conflicts: mod/profile.php	2017-03-12 20:52:14 +00:00
Michael	b6a4a2ec7f	Merge remote-tracking branch 'upstream/develop' into 1702-no-language	2017-03-12 20:50:20 +00:00
Michael	18d23ca443	Merge remote-tracking branch 'upstream/develop' into 1702-detect-server	2017-03-12 20:49:48 +00:00
Tobias Diekershoff	1bf089e424	Merge pull request #3216 from annando/1701-performance Better network handling, improved structure	2017-03-12 15:40:56 +01:00
Sandro Santilli	df6304cc42	Fix "remember me" cookie for OpenID logins Closes #2432 NOTE: in order to obtain the same "cookie hash" it was required to include unneeded fields in the user record structure, this would be good to change in the future...	2017-03-12 01:11:35 +01:00
Michael	0989f725a6	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-05 16:23:58 +00:00
Michael	2775adfdf5	Second followup for profile issue	2017-03-05 11:07:10 +00:00
Michael	b42167f0ac	We can now return a list of known servers	2017-03-04 11:04:00 +00:00
Michael	ec9dddb445	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-04 10:33:43 +00:00
Michael	461ee5c8a8	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-04 08:38:04 +00:00
Michael	8690b97c27	Follow up for issue 3196: We need an index hint for performance issues	2017-03-04 08:25:47 +00:00
Michael Vogel	9ccb6072b8	Merge pull request #3205 from tobiasd/20170226-issue3187 Bugfix issue 3187	2017-03-03 21:36:37 +01:00
Tobias Diekershoff	2fa9f76e67	better wording and placeholder for name	2017-03-03 10:28:29 +01:00
Michael	324d8bfe8e	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server	2017-03-02 20:20:38 +00:00
Michael	3ab845dcf3	Issue 3196: Not all forum posts weren't shown	2017-03-01 21:47:10 +00:00
Michael	cc86d8ea14	Language data won't be displayed anymore (it was experimental stuff)	2017-02-27 23:59:05 +00:00
Michael	0afb0c2ea4	NULL_DATE is now a constant	2017-02-27 23:37:15 +00:00
Michael	997e94555b	The old pager is removed	2017-02-27 21:46:37 +00:00
Michael	39386ded36	"old_share" is removed	2017-02-27 21:26:37 +00:00
Michael	99fb15037b	Removed some more unneeded stuff	2017-02-27 06:27:22 +00:00
Michael	733caa5669	Removed admin settings	2017-02-26 23:19:13 +00:00
Michael	48209f0ecd	Now there is only the worker.	2017-02-26 23:16:49 +00:00
Michael	2a8a5a6d88	Improved server vitality detection	2017-02-26 18:19:20 +00:00
Tobias Diekershoff	7442ce3d6d	change Fan/Admirer to Subscriber	2017-02-26 16:47:11 +01:00
Michael	f9f27c2f5f	Merge remote-tracking branch 'upstream/develop' into 1701-performance	2017-02-23 06:55:35 +00:00
Michael	cec79ddf2b	See issue 3157: Fulltext is now disabled	2017-02-21 05:23:37 +00:00
Tobias Diekershoff	a4dcd8be55	Merge pull request #3159 from annando/bugfix-diaspora-relay Bugfix: Only accept postings from anyone when the relay is configured	2017-02-11 08:58:38 +01:00
Michael	40390cc5ec	Diaspora Relay: Only accept postings from anyone when the relay is configured	2017-02-10 20:45:22 +00:00
rabuzarus	3474b40732	fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts	2017-02-10 03:51:01 +01:00
Michael	9c4a53e380	Optimized query for nodeinfo, better way to analyze posting problems with DFRN	2017-02-04 16:16:15 +00:00
Michael	49834676c7	Bugfix issue 3116: Only allowed themes are displayed	2017-01-31 05:14:32 +00:00
rabuzarus	6d01dd83fe	Bugfix: fix the author image in the meta elements in html head (display module)	2017-01-30 15:23:44 +01:00
Michael	c1eea3771f	Bugfix: Sometimes the self contact seems to destroy itself	2017-01-29 13:57:03 +00:00
Tobias Diekershoff	069dd5b75d	Merge pull request #3125 from annando/alternate-pr-3124 Alternate solution for pull request 3124	2017-01-28 15:25:30 +01:00
Michael	ea22828d37	Alternate solution for pull request 3124	2017-01-28 12:19:04 +00:00
Tobias Diekershoff	af699940d4	typo	2017-01-28 11:20:39 +01:00
Tobias Diekershoff	703628cd01	wording	2017-01-28 11:12:31 +01:00
Tobias Diekershoff	83607ff894	enforce them, but inform the user about it	2017-01-28 10:10:35 +01:00
Tobias Diekershoff	334bc7037a	don't enfoce non-empty passwords during installation	2017-01-28 10:02:32 +01:00
Hypolite Petovan	c38a5e443d	Merge branch 'develop' into issue/#3062 * develop: (68 commits) Added documentation update to the translation update to the translations translation docs now contain basic usage of the Transifex client - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content - Remove misc TinyMCE mentions in docs and minifyjs - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter - Remove TinyMCE mentions in themes - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value Remove tinyMCE libraries limit the description of the meta tag to 160 characters in /mod/display Improved handling of non string values in the config Bugfix: Caching of non string cache values now works. Reformatted stuff, improved query Auto-focus first input field of modal when shown Use cache instead of config for storing last proc_run time Some added logging Bugfix for masses of php warnings Rearranged the logging Some changed logging ... # Conflicts: # view/theme/frost-mobile/js/theme.js # view/theme/frost/js/theme.js	2017-01-27 15:30:21 -05:00
Michael Vogel	d61a4a67db	Merge pull request #3109 from Hypolite/issue/scrap-tinymce Scrap TinyMCE	2017-01-27 21:08:33 +01:00
Tobias Diekershoff	722b18ead7	Merge pull request #3096 from annando/1701-index-again Some more index stuff	2017-01-27 16:52:12 +01:00
Hypolite Petovan	bf6d235b26	- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content	2017-01-26 23:04:38 -05:00
Hypolite Petovan	66482c1d9c	- Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter	2017-01-26 22:57:53 -05:00
Hypolite Petovan	9d5384f107	- Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value	2017-01-26 22:50:27 -05:00
rabuzarus	4c8de5fcfd	limit the description of the meta tag to 160 characters in /mod/display	2017-01-25 13:10:42 +01:00
Michael	becfeaf0b7	Bugfix: Caching of non string cache values now works.	2017-01-24 18:55:07 +00:00
Michael	df28f99caa	Merge remote-tracking branch 'upstream/develop' into 1701-index-again	2017-01-24 06:48:05 +00:00
Michael	ea18d1829f	Reformatted stuff, improved query	2017-01-24 06:45:46 +00:00
rabuzarus	5ab6843f38	Bugfix: fix typo in event variable	2017-01-20 13:24:53 +01:00
Michael	75097ebf37	Added limit	2017-01-19 10:00:44 +00:00
Michael	0548099f6c	The config class now makes less database reads.	2017-01-18 21:45:32 +00:00
Michael	53393233c3	Replace the direct access of config variables	2017-01-17 19:21:46 +00:00
Michael	47d04416b1	As well here ...	2017-01-15 15:18:31 +00:00
Michael	99e9791d1f	We fetched a little bit too much ...	2017-01-15 15:06:32 +00:00
Michael	7e846ba7ac	Hide the calculation for "previous" and "next" behind a setting	2017-01-15 14:50:26 +00:00
Michael	3af099298c	Some more caching	2017-01-13 17:31:10 +00:00
Michael	844fefc9c4	Caching the events.	2017-01-13 13:04:37 +00:00
Michael	fd5f151a72	New function to detect heavily used indexes	2017-01-13 07:46:47 +00:00
Michael	e67133ef56	Merge remote-tracking branch 'upstream/develop' into 1701-curl-range Conflicts: mod/oexchange.php mod/uimport.php	2017-01-12 07:25:44 +00:00
Hypolite Petovan	b61479ba6e	Merge remote-tracking branch 'friendica/develop' into issue/#3062 # Conflicts: # view/theme/duepuntozero/theme.php # view/theme/smoothly/theme.php	2017-01-12 09:19:59 +11:00
Michael Vogel	5eaa5951a1	Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3 Normalize App parameter declaration (mod folder, 2 out of 3)	2017-01-11 22:49:01 +01:00
Michael Vogel	05a2989ecb	Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3 Normalize App parameter declaration (mod folder, 3 out of 3)	2017-01-11 22:33:41 +01:00
Michael Vogel	df8b522f6b	Merge pull request #3077 from Hypolite/issue/#3039-mod-1of3 Normalize App parameter declaration (mod folder, 1 out of 3)	2017-01-10 17:28:21 +01:00
Michael	a2debaa68a	Download limit for fetching data via "z_fetch_url"	2017-01-09 23:10:32 +00:00
Hypolite Petovan	a7ce601580	Normalize App parameter declaration (mod folder, 3 out of 3)	2017-01-09 23:14:55 +11:00
Hypolite Petovan	f92918f471	Normalize App parameter declaration (mod folder, 2 out of 3)	2017-01-09 23:14:25 +11:00
Hypolite Petovan	8a197055e3	Normalize App parameter declaration (mod folder, 1 out of 3)	2017-01-09 23:12:54 +11:00
Hypolite Petovan	479180ca8e	Merge branch 'develop' into issue/#3062	2017-01-08 11:44:45 +11:00
Michael	ed0143c9f0	Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes	2017-01-07 16:13:57 +00:00
Hypolite Petovan	daa8e4f901	Cleaning up, actual changes are in the next commits - Formatting - Trailing spaces - Extraneous blank lines - Large comments	2017-01-08 02:03:11 +11:00
Michael	c2543f918b	Last minutes changes	2017-01-07 13:52:30 +00:00
Michael	1b48799f08	Don't do queries if not needed	2017-01-07 11:28:18 +00:00
Michael	6976ad4892	Removed some removed indexes	2017-01-06 06:37:27 +00:00
Roland Häder	42c2e09382	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-04 09:03:00 +01:00
Michael	db2d0e0095	removal of useless variable	2017-01-01 23:38:32 +00:00
Michael	79b5eb63db	Some more reverts	2017-01-01 23:37:29 +00:00
Michael	212f78386d	Deactivated the auto mention - we should do it differently.	2017-01-01 23:35:34 +00:00
Michael	8aaf09f9ee	Automatically add a Diaspora mention	2017-01-01 23:18:42 +00:00
Michael	8c579735f9	Diaspora: Add a mention when doing a thread reply	2017-01-01 21:21:16 +00:00
Roland Haeder	d2df464d8c	added curly braces + fixed indenting according to code review by Hypolite Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-30 21:49:08 +01:00
Roland Haeder	d2280d4120	Merge remote-tracking branch 'upstream/develop' into develop dbm::is_result() calls needed merge Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-30 21:33:41 +01:00
Michael Vogel	c348dd6134	Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh Update the photo albums cache on upload, album deletion or renaming	2016-12-29 11:08:16 +01:00
Tobias Diekershoff	236c7805a4	for the fed stats it is better to have a >= then a = in the query	2016-12-27 17:53:59 +01:00
rabuzarus	a6d7ad0755	Update cache on photo edit only when album name has changed	2016-12-26 02:41:00 +01:00
rabuzarus	08fb35838c	Update the photo albums cache on upload, album deletion or renaming	2016-12-25 16:58:38 +01:00
Roland Haeder	f844d96a7f	added some spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 20:21:38 +01:00
Roland Haeder	b7c9d63b7a	Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated. Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 20:09:10 +01:00
Roland Haeder	3dbb92c0dc	added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:11 +01:00
Roland Haeder	89319d9579	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:09 +01:00
Roland Haeder	45dd1ccc7b	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:08 +01:00
Roland Haeder	c1b76e889e	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-23 19:51:06 +01:00
Roland Häder	54905a3d81	added more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:51:02 +01:00
Roland Häder	3472191b05	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:51:00 +01:00
Roland Häder	8ce20f975c	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:50:58 +01:00
Roland Häder	8b8a45b703	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:50:53 +01:00
Roland Häder	9fad8109ff	changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } --------------------- Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:50:21 +01:00
Roland Häder	9b6ad2fc47	Coding convention: - added curly braces - added space between "if" and brace - also added TODO (old-lost code?) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:49:39 +01:00
Roland Häder	f8a213e23b	much more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:49:36 +01:00
Roland Häder	97c507e763	Coding convention applied: - space between "if" and brace - curly braces on conditional blocks Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-23 19:49:15 +01:00
Roland Häder	31cd3fb33c	Coding convention continued: - added curly braces - added spaces between if/foreach and brace - made code block look nicer (spaces added, tabs replaced by space) - added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 17:13:34 +01:00
Roland Häder	13b57d4d50	Coding convention continued: - added curly braces - added spaces between if/foreach and brace - made code block look nicer (spaces added, tabs replaced by space) - added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 17:12:34 +01:00
Roland Häder	5547bc2cc2	Continued rewriting a bit: - more usage of dbm::is_result() - nicer look of code Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 17:03:00 +01:00
Roland Häder	d82ed5d1b4	Continued with code convention: - added more curly braces - added space betweent if/foreach and brace - added spaces for beautification - converted some " to ' (mixed usage) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 15:31:23 +01:00
Roland Häder	c9194b0381	Continued with code convention: - added more curly braces - added space betweent if/foreach and brace - added spaces for beautification - converted some " to ' (mixed usage) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 15:30:23 +01:00
Roland Häder	20e71d21a6	Merge branch 'rewrites/app_get_baseurl_static' into develop Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/admin.php mod/bookmarklet.php mod/community.php mod/contacts.php mod/crepair.php mod/editpost.php mod/events.php mod/install.php mod/lostpass.php mod/network.php mod/notify.php mod/suggest.php mod/uexport.php mod/videos.php view/theme/duepuntozero/config.php view/theme/frio/config.php view/theme/quattro/config.php view/theme/vier/config.php	2016-12-22 11:37:23 +01:00
Roland Häder	ad20c5504d	Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/diaspora.php object/Item.php	2016-12-22 11:33:00 +01:00
Roland Häder	c0df692f5f	Merge remote-tracking branch 'upstream/develop' into develop Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/diaspora.php object/Item.php	2016-12-22 11:29:56 +01:00
Michael Vogel	9e689e8b9b	Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links Diaspora: Complete /people/* links from fcontact or author domain	2016-12-22 10:17:44 +01:00
Roland Häder	a314dbc562	removed conflict solving remains, took from upstream/develop Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-22 09:14:14 +01:00
Roland Häder	8b7d5d0efc	Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static	2016-12-22 09:06:00 +01:00
Roland Häder	4c04a78d1b	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-22 09:03:44 +01:00
rabuzarus	2fcbba9410	provide local time for notifications	2016-12-22 00:28:52 +01:00
rabuzarus	125d2f24dd	frio: add profile link to the notifications url	2016-12-21 23:17:55 +01:00
Roland Haeder	b3d33ee1e6	More curly braces added, left some TODOs behind Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:17:47 +01:00
Roland Haeder	59404e4eaf	More curly braces added, left some TODOs behind Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:17:36 +01:00
Roland Haeder	d3e666f71a	added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:12:28 +01:00
Roland Haeder	d97b6a2eba	added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 23:04:09 +01:00
Roland Haeder	d80b82c55d	no need for this else block Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 22:53:32 +01:00
Roland Haeder	e6a4a736fc	no need for this else block Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 22:53:08 +01:00
Roland Haeder	0436782e70	Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-21 20:01:51 +01:00
Roland Häder	7f98c8086c	added curly braces + space Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/events.php	2016-12-21 09:31:31 +01:00
Roland Häder	bb37cac772	added curly braces + space Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-21 09:30:49 +01:00
Hypolite Petovan	47f88bd625	proxy mod: Standards bearer - Enforced PSR-2 standards - Normalized concatenation formatting - Normalized string delimiters - Normalized condition operators - Collapsed directly nested conditions - Used dvm::is_result - Added comments	2016-12-21 09:15:20 +01:00
Hypolite Petovan	1f94cb9aac	proxy: Simplify url extension extraction	2016-12-21 09:14:49 +01:00
Hypolite Petovan	c0ec9c5907	proxy_url: Fix extension extraction for URLs containing a . after a ?	2016-12-21 09:14:09 +01:00
Roland Häder	b580c23844	Merge remote-tracking branch 'upstream/develop' into develop Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/proxy.php	2016-12-21 09:11:58 +01:00
Roland Haeder	3befdc6920	used more App::get_baseurl() instead of get_app()->get_baseurl(). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:51:54 +01:00
Roland Haeder	7c342600c3	used more App::get_baseurl() instead of get_app()->get_baseurl(). Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:51:25 +01:00
Roland Haeder	9814414b6a	used dbm::is_result() instead of count() Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:39:06 +01:00
Roland Haeder	b4bc07fdcc	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:32:00 +01:00
Roland Haeder	536f078ed4	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:31:05 +01:00
Hypolite Petovan	e54ee2e509	Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension # Conflicts: # include/follow.php	2016-12-20 15:29:30 -05:00
Hypolite Petovan	b2768d8f1c	proxy mod: Standards bearer - Enforced PSR-2 standards - Normalized concatenation formatting - Normalized string delimiters - Normalized condition operators - Collapsed directly nested conditions - Used dvm::is_result - Added comments	2016-12-20 15:23:08 -05:00
Roland Haeder	52f14ffa5f	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:17:09 +01:00
Roland Haeder	6e44acfed6	Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:15:53 +01:00
Hypolite Petovan	6e929934c5	proxy: Simplify url extension extraction	2016-12-20 15:14:43 -05:00
Roland Haeder	b6d11f2129	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-20 19:33:40 +01:00
Hypolite Petovan	e8e1f9253d	Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links # Conflicts: # include/follow.php	2016-12-20 12:50:36 -05:00
Hypolite Petovan	4a7c3b9eef	Diaspora: Fix class name case + add self	2016-12-20 12:44:15 -05:00
Roland Häder	de689583e2	added more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/admin.php	2016-12-20 17:58:34 +01:00
Roland Häder	4b221d216e	added more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 17:57:40 +01:00
Michael Vogel	7141ce9163	Merge pull request #3030 from Hypolite/bug/proxy_url_extension proxy_url: Fix extension extraction for URLs containing a . after a ?	2016-12-20 17:53:26 +01:00
Roland Häder	4805aa8fdb	Don't cherry-pick: - reverted dbm::is_result() to count() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 16:28:23 +01:00
Michael	4aafbb09a5	The object type "photo" is deprecated and was replaced by "image" Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/like.php mod/photos.php mod/subthread.php	2016-12-20 16:00:23 +01:00
Roland Häder	b9e4b9f274	Merge remote-tracking branch 'upstream/develop' into develop Changes in #3034 were somehow conflicting. :-( Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: include/like.php mod/photos.php mod/subthread.php	2016-12-20 15:44:31 +01:00
Tobias Diekershoff	cc16369b6f	Merge pull request #3033 from annando/1612-object-type The object type "photo" is deprecated and was replaced by "image"	2016-12-20 15:44:07 +01:00
Roland Häder	51716957b2	converted more to dbm::is_result() + added braces/space Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 15:37:27 +01:00
Roland Häder	4f26bee453	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:45:36 +01:00
Roland Häder	0e58bf6675	Changed $a->get_baseurl() to App::get_baseurl() Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:45:16 +01:00
Roland Häder	d5f2d387bd	Continued a bit: - added more curly braces around conditional blocks - added space between "if" and brace - aligned "=>" (will do with more if wanted) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:42:33 +01:00
Roland Häder	b69d82e64c	Continued a bit: - added more curly braces around conditional blocks - added space between "if" and brace - aligned "=>" (will do with more if wanted) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:42:10 +01:00
Roland Häder	a883514604	Opps, forgot this ... Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:38:23 +01:00
Roland Häder	c22878643b	Opps, forgot this ... Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:38:11 +01:00
Roland Häder	a25b628286	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:36:09 +01:00
Roland Häder	8d28135c59	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 12:35:18 +01:00
Roland Häder	ace8f753ac	added much more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/bookmarklet.php mod/community.php mod/contacts.php mod/crepair.php mod/events.php mod/network.php mod/suggest.php mod/uexport.php view/theme/duepuntozero/config.php view/theme/frio/config.php view/theme/quattro/config.php view/theme/vier/config.php	2016-12-20 11:59:13 +01:00
Roland Häder	e24c3a5b82	added much more curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:56:34 +01:00
Roland Häder	5f41375ad3	Continued: - added curly braces + spaces - added todo about testing empty/non-empty strings Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:41:20 +01:00
Roland Häder	51d352922a	Continued: - added curly braces + spaces - added todo about testing empty/non-empty strings Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:39:53 +01:00
Roland Häder	fc9dbc0899	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:38:28 +01:00
Roland Häder	5588472f6d	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:38:16 +01:00
Roland Häder	f3529e7dbc	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:36:27 +01:00
Roland Häder	c86f09a894	added spaces + curly braces Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:36:03 +01:00
Roland Häder	2e908ebbbf	added more curly braces + fixed space->tab for code indentation. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:33:42 +01:00
Roland Häder	c1845c97cc	added more curly braces + fixed space->tab for code indentation. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:33:04 +01:00
Roland Häder	4780df394d	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/notify.php	2016-12-20 11:28:39 +01:00
Roland Häder	507db84243	added curly braces + space between "if" and brace Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:27:40 +01:00
Roland Häder	fd0e2a9406	added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:22:22 +01:00
Roland Häder	9c097c20dd	added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it) Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:21:32 +01:00
Roland Häder	fa444f373c	added curly braces + space between "if" and brace + added missing @param Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:19:23 +01:00
Roland Häder	4299cce719	added curly braces + space between "if" and brace + added missing @param Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:18:54 +01:00
Roland Häder	e05a8e9974	added curly braces + space between "if" and brace + added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:15:15 +01:00
Roland Häder	40bdc5d33c	added curly braces + space between "if" and brace + added TODO Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:14:30 +01:00
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

... 10 11 12 13 14 ...

4309 commits