Comparing 9904eba277...bbcf7e9aa1 - core

mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00

Author	SHA1	Message	Date
Mario	bbcf7e9aa1	Merge branch '10.2RC'	2025-03-17 19:39:51 +00:00
Mario	45a2ebc662	version 10.2	2025-03-17 19:33:32 +00:00
Mario	aece22aee6	Merge branch 'dev' into 10.2RC	2025-03-17 19:32:36 +00:00
Mario	7c0f98a513	Merge branch 'dev' into 10.2RC	2025-03-17 19:30:39 +00:00
Mario	9369085835	Merge branch 'dev' into 10.2RC	2025-03-17 19:20:55 +00:00
Mario	00b3039b6e	Merge branch 'dev' into 10.2RC	2025-03-16 11:16:31 +00:00
Mario	bcfdb73001	Merge branch 'dev' into 10.2RC	2025-03-14 10:52:17 +00:00
Mario	991815469f	Merge branch 'dev' into 10.2RC	2025-03-14 10:49:50 +00:00
Mario	a0c98e070e	Merge branch 'dev' into 10.2RC	2025-03-09 16:14:46 +00:00
Mario	4ba470318c	Merge branch 'dev' into 10.2RC	2025-03-09 10:09:47 +00:00
Mario	8d45fd36a1	css fix	2025-03-07 09:01:48 +00:00
Mario	6ed2301a94	bump version	2025-03-07 08:54:59 +00:00
Mario	a0eb701503	Merge branch 'dev' into 10.2RC	2025-03-07 08:54:06 +00:00
Mario	13002af4c3	version 10.2RC1	2025-03-06 10:00:21 +00:00
Mario	ee988edc83	make sure attachment is an array (cherry picked from commit `2b4b409c01`) Co-authored-by: Mario <mario@mariovavti.com>	2025-03-03 08:56:30 +00:00
Mario	7579749adc	Merge branch 'debianinstall' into 'master' Debianinstall See merge request hubzilla/core!2179	2025-03-03 08:40:29 +00:00
OJ Random	cf408c3fac	Debianinstall	2025-03-03 08:40:29 +00:00
Mario Vavti	6c8da6ce36	version 10.0.8	2025-02-01 12:30:15 +01:00
Mario	e19a050b92	changelog (cherry picked from commit `a13bf6a3fe`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-02-01 11:28:04 +00:00
Mario	546c4fcad2	calling fetch_post_tags() will add duplicate items here (cherry picked from commit `0a17b83578`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-02-01 00:03:50 +00:00
Mario	2782b6d724	possible sql performance improvements (cherry picked from commit `dc076a4c00`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-30 12:10:45 +00:00
Mario	324b281813	fix php warniing in case tgt_type is not set (cherry picked from commit `03d1f3383e`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-24 12:16:33 +00:00
Mario	69a23c604d	return if $furl is empty for some reason (cherry picked from commit `174469970a`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-24 11:44:34 +00:00
Mario Vavti	9b13055dfe	version 10.0.7	2025-01-22 13:08:42 +01:00
Mario	06afd8a375	changelog (cherry picked from commit `27efb887d2`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-22 11:24:32 +00:00
Mario	6f027544d6	make sure to provide uid to drop_item() where applicable and check ownership when imporing feed items (cherry picked from commit `ccd52584a4`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-22 11:22:15 +00:00
Mario	ebab5ff281	use bin2hex() instead of btoa() to create an id for the toast. btoa() will not work with nonascii chars. (cherry picked from commit `0165f44063`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-15 12:00:01 +00:00
Mario	5fb6e5d6f7	fix regression in notifications filter (cherry picked from commit `8fc0e41beb`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-06 09:15:59 +00:00
Mario Vavti	5a84ffdcda	version 10.0.6	2025-01-05 13:31:28 +01:00
Mario	ad993645be	changelog (cherry picked from commit `392cb020aa`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-05 12:30:32 +00:00
Mario	0701cde239	dismiss entries where primary location data is not complete for some reason (cherry picked from commit `884b612ffc`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-05 11:56:51 +00:00
Mario	a136c288d5	cleanup outdated doc entries just once after the docs were imported to the db (cherry picked from commit `ae0d138d2a`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-05 11:56:09 +00:00
Mario	1624a2620a	remove redundant arguments (cherry picked from commit `48ef4744ac`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2025-01-04 10:20:40 +00:00
Mario Vavti	f4769d0f04	version 10.0.5	2024-12-29 17:36:28 +01:00
Mario Vavti	c8e30a00e2	Merge branch 'dev'	2024-12-29 17:35:44 +01:00
Mario Vavti	51745d3652	Merge branch 'dev'	2024-12-29 17:18:04 +01:00
Mario	762d402dea	Merge branch 'dev'	2024-12-26 09:00:33 +00:00
Mario	b05a440f03	version 10.0.4	2024-12-26 08:58:46 +00:00
Mario	9bb4988eda	Merge branch 'dev'	2024-12-26 08:55:36 +00:00
Mario	49cb73c8c7	version 10.0.3	2024-12-26 08:04:05 +00:00
Mario	2a00bd9a28	Merge branch 'dev'	2024-12-26 08:03:26 +00:00
Mario	5813b65aed	hotfix release version 10.0.2	2024-12-25 12:03:43 +00:00
Mario	f8acd1d3a5	Merge branch 'dev'	2024-12-25 12:02:32 +00:00
Mario	632721da4e	version 10.0.1	2024-12-22 08:51:48 +00:00
Mario	f3a702e927	Merge branch 'dev'	2024-12-22 08:51:15 +00:00
Mario	c55662510d	fetch missing commit from dev	2024-12-22 08:31:04 +00:00
Mario	f01e917fff	Merge branch 'dev'	2024-12-22 08:26:26 +00:00
Mario	b80cba4e68	Merge branch '10.0RC'	2024-12-21 18:49:06 +00:00
Mario	f2b28f5bbb	version 10.0	2024-12-21 18:46:40 +00:00
Mario	4aeb4963a4	Merge branch 'dev' into 10.0RC	2024-12-21 18:44:04 +00:00
Mario	cf66f245b4	RC2	2024-12-21 12:34:05 +00:00
Mario	91baa52b8b	Merge branch 'saiwal-master-patch-76831' into 'master' Update chat.tpl to correct expand and contract icons from forkawesome to bootstrap icons. See merge request hubzilla/core!2171	2024-11-19 21:08:32 +00:00
Saiwal K	c626985448	Update chat.tpl to correct expand and contract icons from forkawesome to bootstrap icons.	2024-11-17 19:59:31 +00:00
Mario	586cda5155	fix some conent import issues (cherry picked from commit `c9a8914b07`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-11-14 13:30:07 +00:00
Mario	513cd3b99a	fix click area in dropdown add/remove reaction (cherry picked from commit `8268ed1ba7`) Co-authored-by: Mario <mario@mariovavti.com> (cherry picked from commit `ce9d67f7b1`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-11 20:00:36 +00:00
Mario	f05b8bd87d	Do not filter deleted hublocs in xchan_query because it will result in empty profile info in conversations if the hubloc was deleted. Deleting a hublocation does not neccesarily delete its content and the author could appear again from another location. (cherry picked from commit `4e6696b049`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-11-09 20:12:21 +00:00
Mario	e466c73407	fix allday not set if a rsource is provided (cherry picked from commit `17183cc5dc`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-07 14:31:18 +00:00
Mario	e5aae2af0f	fix allday variable not set when clicking an event (cherry picked from commit `939e5d9ca5`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-06 16:17:18 +00:00
Mario	173c4d242d	version 9.4.4	2024-11-06 13:06:05 +00:00
Mario	76b8c36f7c	changelog (cherry picked from commit `12c88c06d8`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-06 13:05:18 +00:00
Mario	f35352090e	Update translations for Norwegian Bokmål (cherry picked from commit `35a05073f2`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-06 12:30:37 +00:00
Mario	e5db47e0d5	Module\Thing: Don't try to escape field that's not present The `profile_assign` field is only present if the multiple profiles feature is enabled. (cherry picked from commit `472484dde0`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-06 12:30:16 +00:00
Mario	6a52e502aa	Module\Thing: Don't use $_REQUEST superglobal. Replaces all occurences with $_POST or $_GET instead. (cherry picked from commit `5c3bdbd1e0`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-06 12:29:46 +00:00
Mario	6a866fe904	Move Norwegian translations from nb-no to nb (cherry picked from commit `ec02453d37`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-06 12:28:51 +00:00
Mario	d9d239bf3a	only zot6 hublocs have a sitekey so only query such hublocs. This will safe alternative network hublocs from being marked deleted allthough they are intact (cherry picked from commit `7a3f2c1ba9`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-06 11:16:46 +00:00
Mario	429d15f009	correctly hide modals and remove unneeded toString() conversion since we are not dealing with string objects here (cherry picked from commit `9f473fc204`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-06 11:16:20 +00:00
Mario	2b44be58c3	explicit check for channel_address (cherry picked from commit `e20327d267`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-03 11:02:35 +00:00
Mario	c44db397ff	Zotlabs\Module\Setup: Fix deprecation. Using `self` in callables has been deprecated, so change to proper fully qualified class name. (cherry picked from commit `8ab3ad6531`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-03 11:02:04 +00:00
Mario	a385fdff37	Zotlabs\Web\HttpMeta: Declare and init properties. The $ogproperty was not declared, which triggered a warning in PHP 8.2. Also fixed the initialization of the properties, and removed the now superfluous constructor. (cherry picked from commit `bf008465ad`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-03 11:01:50 +00:00
Mario	20aacb82c6	tests: Declare private property $output. Uncovered by PHP 8.2 because dynamic properties are deprecated. (cherry picked from commit `a29a1c768d`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-03 11:01:38 +00:00
Mario	0d17d8dad9	tests: Fix typo in UnitTestCase. Uncovered by PHP 8.2 because dynamic properties are deprecated. (cherry picked from commit `90bc987ea7`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-03 11:01:21 +00:00
Mario	2ab0118c13	Fix missing CSRF checks in admin/account_edit (cherry picked from commit `38c947590e`) 342d94c3 tpl: Fix warnings in templates. bccaeb1e tests: Update Module\TestCase to support POST requests f627e55b tests: Update account fixtures with fixed account_level. ee62aff4 Module\Admin\Account_edit: Add missing CSRF checks. Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-03 10:59:41 +00:00
Mario	30419bdbf6	add ocap tokens to all media files and attachments (cherry picked from commit `2f0a47e583`) Co-authored-by: Mario <mario@mariovavti.com>	2024-11-03 10:59:16 +00:00
Mario	c958cc6f90	URL escape zid param in head.tpl This should fix issue #1877 fully. (cherry picked from commit `065f85bab1`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-11-01 09:03:21 +00:00
Mario	38ac60e618	make sure the objects published date has the correct time format (cherry picked from commit `160c40b580`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-31 11:12:54 +00:00
Mario	23a19ecf1f	escape the zid parameter - issue #1877 (cherry picked from commit `0207c02420`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-30 09:18:23 +00:00
Mario	8b75f50f23	fix en tos page (cherry picked from commit `0e50b1d10c`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-10-27 12:57:02 +00:00
Mario	436b1673cf	make sure we select only sys channel items and remove dupes checking (this will be checked in item_store() anyway) (cherry picked from commit `e530476e6c`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-23 12:08:03 +00:00
Mario	96210f5ecc	fix edit button not clickable if below right aside (cherry picked from commit `1411eafa9b`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-18 19:14:04 +00:00
Mario	9e9e8efb2d	fix tags rendering in the editor (cherry picked from commit `f4495fd441`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-17 09:04:25 +00:00
Mario	e9dc4b553b	Fix regex to detect URLs in cleanup_bbcode. This fixes the issue where the text after the URL would be included in the link if it was immediately followed by a newline. Example: https://example.com this is a test. Would become: #^[url=https://example.com_this]https://example.com_this[/url] is a test (cherry picked from commit `687cda3673`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-12 17:08:15 +00:00
Mario	c70bd08c10	Fix duplicate posts from forum clones (cherry picked from commit `e2cfe245b7`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-10-12 13:59:12 +00:00
Mario Vavti	69109a558b	version 9.4.3	2024-10-10 12:16:33 +02:00
Mario	4aff6d19d6	changelog (cherry picked from commit `a5c1b669b4`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-10-10 10:11:31 +00:00
Mario	3cb5d14037	also discard Add/Remove at the AP side (cherry picked from commit `2aee659cbd`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-10-10 10:04:17 +00:00
Mario	5f685bcf63	also dismiss add/remove collection activities in fetch_conversation() (cherry picked from commit `44232677c8`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-10 10:03:51 +00:00
Mario	cb44f7e360	dismiss add/remove collection activities until we support themÃ (cherry picked from commit `16603ca854`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-10 10:03:32 +00:00
Mario	8f74ee67e3	css fixes (cherry picked from commit `2693e9e990`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 11:27:56 +00:00
Mario	b0a11537de	remove bogus icon id (cherry picked from commit `04741c761a`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 11:27:40 +00:00
Mario	4de9cb1142	more fa2bi fixes (cherry picked from commit `8f890fb6fa`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 11:07:50 +00:00
Mario	158ddfb009	changelog (cherry picked from commit `1afb2a4ce8`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 07:09:21 +00:00
Mario	2b4f344181	Version 9.4.2	2024-10-04 07:07:31 +00:00
Mario	2e5f922561	due to popular demand: indicate reacted state via icon color (cherry picked from commit `afbeb58c16`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 06:59:50 +00:00
Mario	a6498a0cfc	Reflect change to btn-link in js template (cherry picked from commit `8ffab25f5d`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 06:59:16 +00:00
Mario	1073392398	Fix modal backdrop not removed when like/unlike from the modal (cherry picked from commit `7d41deebce`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 06:51:15 +00:00
Mario	76064dbb33	Fix missing handle icon in mod pdledit_gui (cherry picked from commit `7e48caae6b`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-04 06:27:37 +00:00
Mario	1ab4f36a1b	Merge branch 'master' of https://framagit.org/hubzilla/core	2024-10-03 04:52:40 +00:00
Mario	cea9c88b9e	version 9.4.1	2024-10-03 04:52:18 +00:00
Mario	babe118383	Tests: Unbreak help test. (cherry picked from commit `5b93aa1148`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:27:26 +00:00
Mario	2b140e53cc	changelog (cherry picked from commit `9008760aa6`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-02 20:21:51 +00:00
Mario	fb1514a782	Help: Drop language specifier in URL when redirecting This finally fixes the help for languages other than english. (cherry picked from commit `4daa03f025`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:09:36 +00:00
Mario	7679894684	Replace drop shadow in help toc with brighter color. The drop shadow looked terrible in dark mode. While that could be fixed, I think it looks better with just using the link hover color and making the selected item bold. (cherry picked from commit `8ae9df3bb7`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:08:55 +00:00
Mario	520cf1015c	Move some help related styling from redbasic to module css. (cherry picked from commit `25d9d3ba1b`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:08:33 +00:00
Mario	64bd8eef4b	Use html details element for toc on top of help pages. This allows us to get rid of some more unneccessary JavaScript that just implements stuff that web browsers now do anyways. (cherry picked from commit `26ce231951`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:08:04 +00:00
Mario	aa42f6a6b2	Remove link to "Contents" from the help table of contect sidebar. Changes the element where the jQuery.toc plugin looks for headings to only include the actual help contents, not the toc itself. (cherry picked from commit `fb9464437e`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:07:31 +00:00
Mario	13345d3cbe	deps: Upgrade smarty/smarty to version 4.5.4 This eliminates a potential vulnerability where an template author could inject arbitrary PHP files to be run via the 'extends' tag. See: - https://github.com/smarty-php/smarty/security/advisories/GHSA-4rmg-292m-wg3w - `0be92bc8a6` Impact assessment: In our case I would consider this a low severity issue as we don't allow users to dynamically add or edit smarty templates. Templates has to be updated via merge requests, or by installing a theme. In both cases a malicious attacker already has easier ways to inject whatever code they want. Further, the extend tag is not in use in any of our core templates. (cherry picked from commit `4dff1a1e5b`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:06:10 +00:00
Mario	888ee16d52	fix german about page title (cherry picked from commit `1c45030c58`) Co-authored-by: Mario <mario@mariovavti.com>	2024-10-02 20:05:06 +00:00
Mario	0f3e01f343	markdown: Don't link URLs in code blocks. When passing a content throught the `markdown_to_bb` function to convert any markdown in the content, any recognized URLs in the content would be converted to BBCode links as a post processing step after the main conversion. After commit `a1ccacb825` this did no longer consider content within code blocks, and would thus convert them as to BBCode links. Example: The following content [code] example url: https://example.com [/code] Would be converted to [code] example url: [url=https://example.com]https://example.com[/url] [/code] Prior to commit `a1ccacb825`, code blocks would be protected, so this would not happen. This patch removes the post processing step for converting plain URLs to links completely from this routine. This functionality is in any case covered in the actual BBCode parser where it belongs. This will have some other side effects as well, such as images and links created using Markdown, will not be converted to [zmg] or [zrl] tags where that would be done automatically before. If you intend to use a [zrl] or [zmg] tag, you now need to do so explicitly. (cherry picked from commit `803cd74b48`) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>	2024-10-02 20:04:30 +00:00
Mario	79220ede66	rewrite sql logic to rename photos - there are more DB queries involved now but the previous logic was throwing error in postgresql (while the result was correct anyway) (cherry picked from commit `a5f0253aef`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-10-02 20:03:54 +00:00
Mario	b498e50f74	adjust post app icon and remove obsolete arguments (cherry picked from commit `5cbd42bbc4`) Co-authored-by: Mario <mario@mariovavti.com>	2024-09-27 16:51:57 +00:00
Mario	8c87b06caa	Merge branch '9.4RC'	2024-09-25 19:39:51 +00:00
Mario	339e702beb	version 9.4	2024-09-25 19:38:12 +00:00
Mario	8750c5f7bc	update changelog (cherry picked from commit `5281f4dd9b`) Co-authored-by: Mario <mario@mariovavti.com>	2024-09-25 19:36:46 +00:00
Mario	c3b4397ea3	update changelog (cherry picked from commit `424b31b7f0`) Co-authored-by: Mario <mario@mariovavti.com>	2024-09-25 09:48:57 +00:00
Mario	a3f1189df7	Merge branch 'dev' into 9.4RC	2024-09-24 09:26:12 +00:00
Mario	67d8b977b6	version 9.4RC1	2024-09-24 08:59:26 +00:00
Mario	5b1e532791	Merge branch 'dev' into 9.4RC	2024-09-24 08:58:33 +00:00
Mario	4f129e05e5	notes: make sure we set App::$profile_uid in the module - issue #1865 and minor code cleanup (cherry picked from commit `3733a80c1d`) Co-authored-by: Mario Vavti <mario@mariovavti.com>	2024-09-22 15:26:52 +00:00
Mario	99bff67168	version 9.2.1	2024-07-18 08:55:07 +00:00
Mario	bb3caeb629	Merge branch 'dev'	2024-07-18 08:54:21 +00:00
Mario	45275910e6	Merge branch '9.2RC'	2024-07-06 11:05:22 +00:00
Mario	c04e781926	version 9.2	2024-07-06 11:04:43 +00:00
Mario	09a609ef6b	Merge branch 'dev' into 9.2RC	2024-07-06 11:02:56 +00:00
Mario	db5e524e3c	Merge branch 'dev' into 9.2RC	2024-07-04 10:13:28 +00:00
Mario	8f9e9116df	revert the strlen check	2024-07-04 09:43:20 +00:00
Mario	f944f46744	fix possible php error	2024-07-04 09:30:21 +00:00
Mario	3f5c45a567	Merge branch 'dev' into 9.2RC	2024-06-28 18:19:34 +00:00
Mario	b51ed67efb	Merge branch 'dev' into 9.2RC	2024-06-27 20:02:54 +00:00
Mario	afdc3d6d18	Merge branch 'dev' into 9.2RC	2024-06-27 19:23:20 +00:00
Mario	6a710c3cc3	fix version	2024-06-27 08:29:01 +00:00
Mario	0c1d0f7498	version 9.0.2	2024-06-07 09:25:15 +00:00
Mario	81ba070e1a	update changelog (cherry picked from commit `bd5f77dbeb`) Co-authored-by: Mario <mario@mariovavti.com>	2024-06-07 09:23:32 +00:00
Mario	a7812657f1	update changelog (cherry picked from commit `d862a6f075`) Co-authored-by: Mario <mario@mariovavti.com>	2024-06-07 09:23:02 +00:00
Mario	18725c47a0	move button class to the right dom (cherry picked from commit `59b8c8ad48`) Co-authored-by: Mario <mario@mariovavti.com>	2024-06-07 09:12:32 +00:00
Mario	75e1b70584	php warnings/errors (cherry picked from commit `10d1cbd3ce`) Co-authored-by: Mario <mario@mariovavti.com>	2024-06-04 09:09:41 +00:00
Mario	1dc73935d9	deal with inReplyTo array (cherry picked from commit `2145207ad2`) Co-authored-by: Mario <mario@mariovavti.com>	2024-06-04 09:08:32 +00:00
Mario	7d7b43c5b9	hotfix to mitigate queueworker crash (cherry picked from commit `a4d63ab9a3`) Co-authored-by: Mario <mario@mariovavti.com>	2024-06-04 09:06:50 +00:00
Mario	b5223a4efb	add pdl for mod home (cherry picked from commit `fe43e0994f`)	2024-03-27 10:01:33 +00:00
Mario	d71c2c245f	reduce default directory result set (cherry picked from commit `f85d2d3423`)	2024-03-26 14:59:45 +00:00
Mario	526729c0f1	changelog (cherry picked from commit `418b1eaf78`)	2024-03-26 10:06:05 +00:00
Mario	1cd3369f6a	version 9.0.1	2024-03-26 09:53:38 +00:00
Mario	c26ae553e6	if the updated item contains an open modal, the modal we be replaced with the new data but the backdrop will stay because it is attached to the end of the page -> remove it (cherry picked from commit `e0ac7b7f9f`)	2024-03-26 09:28:25 +00:00
Mario	8d78698d00	deprecated bootstrap namespace in list mode (cherry picked from commit `80d1e07908`)	2024-03-25 21:53:25 +00:00
Mario	d5c189753a	wrong dreport link in blog mode (cherry picked from commit `f72f5c7321`)	2024-03-25 21:53:06 +00:00
Mario	9861e7a0c4	more bootstrap override (cherry picked from commit `a5d483fb5d`)	2024-03-25 21:52:42 +00:00
Mario	6d5fa9205c	more remove additional linebreaks after block element plus test (cherry picked from commit `53354a1930`)	2024-03-25 21:52:14 +00:00
Mario	0fee7804fb	allow to run additional site specific commands at the end of util/udall (cherry picked from commit `c052b7fa99`)	2024-03-25 21:51:49 +00:00
Mario	4002dbaa8b	Merge branch 'master' of https://framagit.org/hubzilla/core	2024-03-25 17:32:11 +00:00
Mario	57e32a7912	add observer to the permissions query. this should not be necessary but it makes it clear why it should be included in the cache key	2024-03-25 17:31:53 +00:00
Mario	b6a72d6e4e	tilt the piin (cherry picked from commit `637f39f282`)	2024-03-25 17:19:32 +00:00
Mario	6e592ed200	add the observer hash to the cache key in categories_widget()	2024-03-25 17:18:26 +00:00
Mario	6c033fc776	Merge branch 'fix-category-widget-template' into 'dev' Fix smarty deprecation warning in category widget. See merge request hubzilla/core!2116 (cherry picked from commit `2ff84ab25a`) `b139e5bb` Fix smarty deprecation warning in category widget.	2024-03-25 14:21:39 +00:00
Mario	7c4362db53	make sure we preserve linefeeds in the actual content of lists and tables also add tests (cherry picked from commit `3c0d6339bb`)	2024-03-24 17:00:56 +00:00
Mario	f7bf9ede72	revert default to activity type Article until we have a more stable solution to override it for platforms which do not support it (cherry picked from commit `ecdd9a4d6e`)	2024-03-23 11:20:44 +00:00
Mario	1aeb05628b	Merge branch '9.0RC'	2024-03-22 08:37:29 +00:00
Mario	b464fae3bf	version 9.0	2024-03-22 08:36:38 +00:00
Mario	a34ce0732d	Merge branch 'dev' into 9.0RC	2024-03-22 08:36:07 +00:00
Mario	01ebd51fb2	Merge branch 'dev' into 9.0RC	2024-03-22 08:27:18 +00:00
Mario	6c6fc82f43	Merge branch 'dev' into 9.0RC	2024-03-22 08:15:20 +00:00
Mario	192ab22cda	Merge branch 'dev' into 9.0RC	2024-03-21 20:48:33 +00:00
Mario	2dc1adf091	Merge branch 'dev' into 9.0RC	2024-03-21 11:37:55 +00:00
Mario	6a3d372050	RC3	2024-03-20 19:41:28 +00:00
Mario	c95359024c	Merge branch 'dev' into 9.0RC	2024-03-20 19:39:00 +00:00
Mario	1097bcdaf9	Merge branch 'dev' into 9.0RC	2024-03-19 09:53:33 +00:00
Mario	f910de849f	Merge branch 'dev' into 9.0RC	2024-03-19 09:46:21 +00:00
Mario	5c2e10c01e	changelog	2024-03-19 09:44:18 +00:00
Mario	569f243ebd	Merge branch 'dev' into 9.0RC	2024-03-18 22:10:16 +00:00
Mario	d4b1bcd641	Merge branch 'dev' into 9.0RC	2024-03-18 09:12:58 +00:00
Mario	e237cf226a	Merge branch 'dev' into 9.0RC	2024-03-18 09:10:34 +00:00
Mario	0745d0616a	Merge branch 'dev' into 9.0RC	2024-03-17 21:34:06 +00:00
Mario	2114779037	Merge branch 'dev' into 9.0RC	2024-03-17 11:01:27 +00:00
Mario	9600789d6b	slightly adjust text sizing	2024-03-16 19:39:48 +00:00
Mario	ea7559c158	RC2	2024-03-16 16:24:27 +00:00
Mario	baa12b7497	Merge branch 'dev' into 9.0RC	2024-03-16 16:23:32 +00:00
Mario	5860abf46f	maybe git can be removed again now after the streams lib got removed?	2024-03-16 15:50:58 +00:00
Mario	2874d3e1e1	Merge branch 'dev' into 9.0RC	2024-03-16 15:47:55 +00:00
Mario	36778850ee	Merge branch 'dev' into 9.0RC	2024-03-16 12:18:46 +00:00
Mario	24132e56d9	Merge branch 'dev' into 9.0RC	2024-03-16 11:56:44 +00:00
Mario	8873c10364	Merge branch '9.0RC' of https://framagit.org/hubzilla/core into 9.0RC	2024-03-16 11:50:42 +00:00
Mario	77e1220cf9	fix version	2024-03-16 11:50:16 +00:00
Mario	d846cefade	adjust encrypted content representation and also add it to bb_to_markdown (cherry picked from commit `f3efdbf230`)	2024-03-15 22:36:44 +00:00
System user; root	5b7387459c	version 8.8.8	2024-02-29 11:05:01 +01:00
System user; root	5d64a9c90f	changelog	2024-02-29 11:03:28 +01:00
System user; root	ffaa985339	streams compatibility	2024-02-29 11:01:30 +01:00
Mario Vavti	f57fbaa5dd	version 8.8.7	2024-01-19 11:07:23 +01:00
Mario Vavti	aba8002170	Fix regression in Activity::actor_store() (cherry picked from commit `9cc85adf47`)	2024-01-19 10:03:58 +00:00
Mario Vavti	0bdffc4a2d	make our jsonld parser happy	2024-01-13 08:49:14 +01:00
Mario Vavti	400dfb4e6b	version 8.8.6	2024-01-11 17:57:51 +01:00
Mario	6b951734ce	changelog (cherry picked from commit `000fcfd1ac`)	2024-01-11 16:56:13 +00:00
Mario	051e2ed6cd	provide some more jsonld builtins (cherry picked from commit `aac406a245`)	2024-01-11 16:40:16 +00:00
Mario Vavti	ef2952b5fd	libsync: dev branch compatibility	2024-01-11 17:00:47 +01:00
Mario Vavti	d655e1d765	version 8.8.5	2024-01-01 21:30:45 +01:00
Mario Vavti	db70ed006d	Merge branch 'dev'	2024-01-01 21:29:53 +01:00
Mario Vavti	9e2a253dda	Merge branch 'dev'	2024-01-01 21:21:04 +01:00
Mario	b629eb5657	fix merge conflict	2023-12-20 12:32:15 +00:00
Mario	2e674cd0b3	version 8.8.4	2023-12-20 12:26:28 +00:00
Mario	3330e9a19a	Merge branch 'dev'	2023-12-20 12:25:43 +00:00
Mario	c0d93bbcf4	Merge branch 'dev'	2023-12-20 12:20:04 +00:00
Mario	d372daff60	Revert "check return from Config::Load() and retry on failure plus cleanup" This reverts commit `69266cd6c6`	2023-12-17 11:16:58 +00:00
Mario	f742e6e394	Merge branch 'dev'	2023-12-17 08:53:32 +00:00
Mario	603c5692ae	Merge branch 'dev'	2023-12-17 08:50:39 +00:00
Mario	abe2ab229a	version 8.8.3	2023-12-17 08:43:08 +00:00
Mario	5ad9939bcf	Merge branch 'dev'	2023-12-17 08:41:48 +00:00
Mario	70470016cc	Merge branch 'dev'	2023-12-17 08:35:33 +00:00
Mario Vavti	c307a71f53	Merge branch 'dev'	2023-12-08 18:08:03 +01:00
Mario	f62d16d274	Merge branch 'dev'	2023-12-06 11:27:54 +00:00
Mario	5f942d78e6	Merge branch 'dev'	2023-12-06 11:23:21 +00:00
Mario	c8158c3d62	vesrion 8.8.2	2023-12-06 11:14:00 +00:00
Mario	1f4762060f	Merge branch 'dev'	2023-12-06 11:12:25 +00:00
Mario	8c9d2bc6f6	Merge branch 'dev'	2023-11-27 08:48:47 +00:00
Mario	43c2e71b25	Merge branch 'dev'	2023-11-27 08:45:19 +00:00
Mario	76a1a6da34	version 8.8.1	2023-11-27 08:42:09 +00:00
Mario	0fd8e02a88	Merge branch '8.8RC'	2023-11-25 17:12:28 +01:00
Mario	55c4bfb670	version 8.8	2023-11-25 17:11:07 +01:00
Mario	ea1030f8bf	Merge branch 'dev' into 8.8RC	2023-11-25 17:06:55 +01:00
Mario	ee149ed1eb	Merge branch 'dev' into 8.8RC	2023-11-25 17:05:08 +01:00
Mario	6e59d95da5	Merge branch 'dev' into 8.8RC	2023-11-23 20:25:13 +00:00
Mario	5cb1a9dcc6	Merge branch 'dev' into 8.8RC	2023-11-22 16:21:58 +00:00
Mario	f8c631a3f0	Merge branch 'dev' into 8.8RC	2023-11-20 20:32:46 +00:00
Mario	0f453ae4cf	version 8.8RC2	2023-11-20 20:27:35 +00:00
Mario Vavti	82e704ec5b	remove the directory updates entry if the channel was removed (cherry picked from commit `67aaa97904`)	2023-10-26 14:08:33 +00:00
Mario	670228ff63	more changelog (cherry picked from commit `4338e4ef86`)	2023-09-16 20:16:59 +02:00
Mario	dbc712c53c	version 8.6.3	2023-09-16 18:02:22 +00:00
Mario	bb6011ea73	Revert "version 8.6.3" This reverts commit `1915f34de8`	2023-09-16 18:00:42 +00:00
Mario	1915f34de8	version 8.6.3	2023-09-16 17:59:31 +00:00
Mario	675f26fe90	changelog (cherry picked from commit `491e309911`)	2023-09-16 19:58:52 +02:00
Mario	24d862c1bc	fix regression in jsonld_document_loader() (cherry picked from commit `3708c1ac8c`)	2023-09-16 13:26:38 +02:00
Mario	a1e583129f	more type checking (cherry picked from commit `a06b28b693`)	2023-09-15 15:46:15 +02:00
System user; apache	3a01aa40d8	only select the required fields to prevent memory exhaustion on big result sets	2023-09-15 15:28:13 +02:00
Mario	ec66949b35	version 8.6.2	2023-08-27 19:06:14 +00:00
Mario	542a527d0d	changelog	2023-08-27 19:02:55 +00:00
Mario Vavti	5e0c392287	test refactor the previous commit (cherry picked from commit `0a3094fc9a`)	2023-08-27 20:01:01 +02:00
Mario Vavti	05ff94941c	allow public stream comments/reactions if item_fetched is set, when fetching parent of a reaction fetch the thr_parent (cherry picked from commit `816bbad28a`)	2023-08-27 20:00:30 +02:00
Mario	a27d75d610	fix notification text for likes in cases where obj.actor is not set (cherry picked from commit `ce4150cd06`)	2023-08-27 19:59:24 +02:00
Mario	446e842904	make sure that we allow "0" as pathname (cherry picked from commit `be19b75031`)	2023-08-27 19:58:55 +02:00
Mario	ba153e2c18	mising pdl file (cherry picked from commit `2d5c99f459`)	2023-08-27 19:58:07 +02:00
Mario	3342ea6891	fix unable to create folders with name 0 (cherry picked from commit `c4af4e3297`)	2023-08-27 19:57:01 +02:00
Mario	8c3d5fd295	fix index name mixup (cherry picked from commit `1acfc05e2d`)	2023-08-27 19:56:26 +02:00
Mario	5fc58fb10a	missing semicolon (cherry picked from commit `b40c38f58c`)	2023-08-27 19:56:10 +02:00
Mario	4e2ae9cd4e	remove unused variable (cherry picked from commit `0ec715d7c9`)	2023-08-27 19:55:49 +02:00
DM42.Net Hubzilla Development	4167ca2e5c	Fix Typo (cherry picked from commit `3bd2a91992`)	2023-08-27 19:55:23 +02:00
Mario	9b3e9dcf02	fix cached jsonld files fetched via network	2023-08-27 17:53:40 +00:00
Mario	f203fcc92e	more performance improvements (cherry picked from commit `4b1384be83`)	2023-08-27 19:50:39 +02:00
Mario	0b20069c20	move trigger out of the loop for better performance and some var -> let	2023-08-27 17:49:52 +00:00
Mario	f89ce93940	ignore internal follow activity (cherry picked from commit `7200c71673`)	2023-08-27 19:45:51 +02:00
Mario	1ddbc8a26d	fix admin table highlight by adding the correct classes (cherry picked from commit `c412c01a65`)	2023-08-27 19:43:09 +02:00
Mario	7dad60bbd5	version 8.6.1	2023-07-18 13:09:56 +00:00
Mario	a66b4626fb	changelog (cherry picked from commit `330add963d`)	2023-07-18 15:08:07 +02:00
Mario	74d7fa61d9	fix hcard addon regression (cherry picked from commit `ef6ea4484e`)	2023-07-18 12:11:50 +02:00
Mario	63fb8d0392	Merge branch '8.6RC'	2023-07-11 18:57:18 +00:00
Mario	384de0925e	version 8.6	2023-07-11 18:56:21 +00:00
Mario	5b5c569c82	RC2	2023-07-05 10:06:57 +00:00
Mario	57796a2f96	only remove the owner from delivery if its their post and minor cleanup (cherry picked from commit `59b217f7ea`)	2023-06-12 10:17:17 +02:00
Mario	ec6cec8854	even more changelog (cherry picked from commit `3fb22d27ab`)	2023-06-02 21:47:41 +02:00
Mario	1cbaab5889	more changelog (cherry picked from commit `fef19b47c2`)	2023-06-02 21:39:27 +02:00
Mario	5126613825	update bootstrap to version 5.3	2023-06-02 19:35:23 +00:00
Mario	07097d2fa3	version 8.4.2	2023-06-02 19:27:36 +00:00
Mario	8c9fb32ca0	changelog (cherry picked from commit `68d921e918`)	2023-06-02 21:26:22 +02:00
Mario	330b36159d	work around hubloc confusion in mod rmagic (cherry picked from commit `02089f15c4`)	2023-06-02 21:18:52 +02:00
Mario	046152e798	improved unseen forums notification (cherry picked from commit `6a27afa6ac`)	2023-06-02 21:18:30 +02:00
Mario	11ca5bb7d5	owa: workaround for friendica when using nginx until this will be fixed at their side and check prrofile uid for features instead of local channel (cherry picked from commit `423fdc0a96`)	2023-06-02 21:16:56 +02:00
Mario	e0838ff8ab	fix wrong array key (cherry picked from commit `11a2419c22`)	2023-06-02 21:13:31 +02:00
Mario Vavti	1b0e268416	fix theme_attachments() (cherry picked from commit `65a472c113`)	2023-06-02 13:35:39 +02:00
Mario	1a27fad9b9	backgound url must be between quotation marks	2023-05-20 12:40:28 +00:00
Mario	c2cfe481df	version 8.4.1	2023-05-20 09:28:32 +00:00
Mario	3a56fb6ec6	Merge branch 'dev'	2023-05-20 09:27:45 +00:00
Mario	1a614ea023	instead of setting the value to 0 just continue so that already existing values will not be overwritten	2023-05-19 13:17:45 +00:00
Mario	65d98af24c	Merge branch '8.4RC'	2023-05-17 13:28:23 +00:00
Mario	62d35627f3	version 8.4	2023-05-17 13:28:05 +00:00
Mario	84f1ed1587	Merge branch 'dev' into 8.4RC	2023-05-17 13:26:01 +00:00
Mario	18914f2081	Merge branch 'dev' into 8.4RC	2023-05-15 08:04:02 +00:00
Mario	5bdd699c9d	Merge branch 'dev' into 8.4RC	2023-05-13 19:52:52 +00:00
Mario Vavti	049fc91615	Merge branch 'dev' into 8.4RC	2023-05-13 21:38:08 +02:00
Mario	5d330e18ff	save a query	2023-05-12 16:29:42 +00:00
Mario	07662ff076	Merge branch 'dev' into 8.4RC	2023-05-12 08:02:19 +00:00
Mario	247cf40ace	bump version	2023-05-10 20:45:33 +00:00
Mario	4a6b450c55	Merge branch 'dev' into 8.4RC	2023-05-10 20:44:43 +00:00
Mario	efd2f78274	check if var is set and escape $ sign in ru translation	2023-05-10 16:42:12 +00:00
Mario	690ff955fa	Merge branch 'dev' into 8.4RC	2023-05-10 16:09:36 +00:00
Mario	d8306fca6f	Merge branch 'dev' into 8.4RC	2023-05-10 12:05:15 +00:00
Mario	4ae81d753c	Merge branch 'dev' into 8.4RC	2023-05-10 08:16:09 +00:00
Mario	93dda6f1fd	Merge branch 'dev' into 8.4RC	2023-05-09 09:20:48 +00:00
Mario	74436eb03e	Merge branch 'dev' into 8.4RC	2023-05-09 09:08:06 +00:00
Mario	677e730235	Merge branch 'dev' into 8.4RC	2023-05-07 14:25:17 +00:00
Mario	06c0af50c3	Merge branch 'dev' into 8.4RC	2023-05-07 12:48:14 +00:00
Mario	f6b66f4cad	Merge branch 'dev' into 8.4RC	2023-05-07 12:17:09 +00:00
Mario	ca913e5077	Merge branch 'dev' into 8.4RC	2023-05-07 12:04:54 +00:00
Mario	984980b170	version	2023-05-07 11:31:50 +00:00
Mario	a57739c462	Merge branch 'dev'	2023-04-09 20:01:22 +00:00
Mario	92246ce3a8	Merge branch 'dev'	2023-04-09 19:53:27 +00:00
Mario	4a72ea6666	Merge branch 'dev'	2023-04-09 19:45:04 +00:00
Mario	dcfdf3a5d7	Merge branch 'dev'	2023-04-09 19:02:36 +00:00
Mario	9083e99d2a	in fact this can be removed (cherry picked from commit `70ca247c88`)	2023-03-24 10:29:09 +01:00
Mario	14fc0c735b	encode object after we have dealt with deleted items and work around a php error (cherry picked from commit `70b3c8080e`)	2023-03-24 10:05:37 +01:00
Mario	79405cf1d3	Merge branch 'dev'	2023-03-21 09:20:57 +00:00
Mario	89285f1408	Merge branch '8.2RC'	2023-03-19 13:55:18 +00:00
Mario	17c0bb2069	version 8.2	2023-03-19 13:54:15 +00:00
Mario	192736f6d7	Merge branch 'dev' into 8.2RC	2023-03-19 13:53:12 +00:00
Mario	4eee8ce770	Merge branch 'dev' into 8.2RC	2023-03-19 13:50:39 +00:00
Mario	3dcfdba74b	simplify	2023-03-19 13:28:43 +00:00
Mario	5428053663	Merge branch 'dev' into 8.2RC	2023-03-19 09:43:34 +00:00
Mario	1e184b781b	Merge branch 'dev' into 8.2RC	2023-03-19 08:22:29 +00:00
Mario	c1ddb89990	Merge branch 'dev' into 8.2RC	2023-03-18 15:47:09 +00:00
Mario	7ac7cb129f	Merge branch 'dev' into 8.2RC	2023-03-17 09:44:17 +00:00
Mario	11b9e546a9	Merge branch 'dev' into 8.2RC	2023-03-14 10:43:03 +00:00
Mario	3a3fd38e3a	Merge branch 'dev' into 8.2RC	2023-03-12 22:04:37 +00:00
Mario	0a679e503e	make sure to only transform channel wall posts for group actors (cherry picked from commit `95cbcf30d7`)	2023-03-12 19:56:34 +01:00
Mario	e7c529f2c3	Merge branch 'dev' into 8.2RC	2023-03-12 18:44:28 +00:00
Mario	dfc70021e3	fix version after merge	2023-03-12 09:38:31 +00:00
Harald Eilertsen	0140f9fe56	translations: Misc updates for nb_NO. (cherry picked from commit `ec6832687b`)	2023-01-27 08:00:26 +01:00
Harald Eilertsen	03243df16a	translations: Fix timeago for nb_NO. (cherry picked from commit `9065a90ac0`)	2023-01-27 08:00:07 +01:00
Mario	2805520d1b	Merge remote-tracking branch 'origin/8.0RC'	2023-01-13 20:01:05 +00:00
Mario	fb7ca18820	version 8.0	2023-01-13 19:56:11 +00:00
Mario	1b00d5657f	Merge branch 'dev' into 8.0RC	2023-01-13 19:55:44 +00:00
Mario	9ec516e5a4	Merge branch 'dev' into 8.0RC	2023-01-12 16:12:26 +00:00
Mario	5cb92b6e21	Merge branch 'dev' into 8.0RC	2023-01-12 11:55:13 +00:00
Mario	2ddb88a34d	RC2	2023-01-11 19:57:35 +00:00
Mario	71761c9039	Merge branch 'dev' into 8.0RC	2023-01-11 16:35:21 +00:00
Mario	bd5e834b42	Merge branch 'dev' into 8.0RC	2023-01-08 08:20:05 +00:00
Mario	4c434129a6	Merge branch 'dev' into 8.0RC	2023-01-05 18:25:45 +01:00
Mario	66333aedb7	fix version	2023-01-05 18:23:00 +01:00
Mario	f6d9406063	streamline ap followers only privacy warning with current handling. also fixes possible php error. (cherry picked from commit `34125177e8`)	2022-12-19 10:05:02 +01:00
Mario	6e881bcef2	exclude not tagable xchan networks handle_tag() (cherry picked from commit `4f9a933108`)	2022-12-08 21:41:56 +01:00
Mario	12a963cc40	version 7.8.7	2022-12-03 09:01:18 +00:00
Mario	f89975fd0e	changelog 7.8.7 (cherry picked from commit `b4dffe5946`)	2022-12-03 09:59:06 +01:00
Mario	00512579f3	fix regression when adding feed contacts (cherry picked from commit `5216c5b232`)	2022-12-02 18:47:40 +01:00
Mario	697a74f37e	fix regression: new event not created (cherry picked from commit `d16b6c3838`)	2022-12-02 18:06:20 +01:00

2 changed files with 6 additions and 6 deletions

									
										10

Zotlabs/Module/Sse_bs.php
									
												View File
												
				@@ -207,7 +207,7 @@ class Sse_bs extends Controller {

								$item_normal

								$sql_extra

								$sql_extra2

								ORDER BY created DESC LIMIT $limit OFFSET $offset",

								ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset",

								intval(self::$uid),

								dbescdate($_SESSION['sse_loadtime']),

								dbesc(self::$ob_hash)

				@@ -290,7 +290,7 @@ class Sse_bs extends Controller {

								$item_normal

								$sql_extra

								$sql_extra2

								ORDER BY created DESC LIMIT $limit OFFSET $offset",

								ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset",

								intval(self::$uid),

								dbescdate($_SESSION['sse_loadtime']),

								dbesc(self::$ob_hash)

				@@ -373,7 +373,7 @@ class Sse_bs extends Controller {

								$item_normal

								$sql_extra

								$sql_extra2

								ORDER BY created DESC LIMIT $limit OFFSET $offset",

								ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset",

								intval(self::$uid),

								dbescdate($_SESSION['sse_loadtime']),

								dbesc(self::$ob_hash)

				@@ -481,7 +481,7 @@ class Sse_bs extends Controller {

								$sql_extra

								$sql_extra2

								$sql_extra3

								ORDER BY created DESC LIMIT $limit OFFSET $offset",

								ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset",

								dbescdate($_SESSION['sse_loadtime']),

								dbesc(self::$ob_hash),

								dbescdate($_SESSION['last_login_date'] ?? $_SESSION['static_loadtime'])

				@@ -679,7 +679,7 @@ class Sse_bs extends Controller {

							AND author_xchan != '%s'

							AND item_unseen = 1

							$item_normal

							ORDER BY created DESC",

							ORDER BY created DESC, received DESC",

							dbesc(ACTIVITY_POST),

							intval(self::$uid),

							dbesc(self::$ob_hash)

									
										2

boot.php
									
												View File
												
				@@ -66,7 +66,7 @@ require_once('include/security.php');

				define('PLATFORM_NAME', 'hubzilla');

				define('STD_VERSION', '10.3');

				define('STD_VERSION', '10.2');

				define('ZOT_REVISION', '6.0');

				define('DB_UPDATE_VERSION', 1263);

Compare commits

327 Commits

dev ... 10.2

10

Zotlabs/Module/Sse_bs.php

View File

2

boot.php

View File

Compare commits

327 Commits dev ... 10.2

10 Zotlabs/Module/Sse_bs.php Unescape Escape View File

2 boot.php Unescape Escape View File

327 Commits

dev ... 10.2

10

Zotlabs/Module/Sse_bs.php

View File

2

boot.php

View File