aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* changelogMario2024-10-101-0/+2
| | | | | (cherry picked from commit a5c1b669b461cb76e9ed8b15e9828183c5ccaf9e) Co-authored-by: Mario Vavti <mario@mariovavti.com>
* also discard Add/Remove at the AP sideMario2024-10-102-7/+22
| | | | | (cherry picked from commit 2aee659cbdd147eca1c49385ea867ea11d2a72e5) Co-authored-by: Mario Vavti <mario@mariovavti.com>
* also dismiss add/remove collection activities in fetch_conversation()Mario2024-10-101-5/+15
| | | | | (cherry picked from commit 44232677c85249b5ae7e83aa0e040586acf2c7cc) Co-authored-by: Mario <mario@mariovavti.com>
* dismiss add/remove collection activities until we support themÃMario2024-10-101-0/+13
| | | | | (cherry picked from commit 16603ca85468162e117e71db53654de0d25611c8) Co-authored-by: Mario <mario@mariovavti.com>
* css fixesMario2024-10-041-1/+1
| | | | | (cherry picked from commit 2693e9e99097c4bbcf8c9103a5876bc0585ff84c) Co-authored-by: Mario <mario@mariovavti.com>
* remove bogus icon idMario2024-10-041-1/+1
| | | | | (cherry picked from commit 04741c761aeb944c8b54472ac7e3d1e9460a8cfc) Co-authored-by: Mario <mario@mariovavti.com>
* more fa2bi fixesMario2024-10-042-5/+5
| | | | | (cherry picked from commit 8f890fb6fa43ee8ee13ef9254e73a68280d545e0) Co-authored-by: Mario <mario@mariovavti.com>
* changelogMario2024-10-041-0/+6
| | | | | (cherry picked from commit 1afb2a4ce85c8a5215b99363b648a2cfa711b0e6) Co-authored-by: Mario <mario@mariovavti.com>
* Version 9.4.2Mario2024-10-041-1/+1
|
* due to popular demand: indicate reacted state via icon colorMario2024-10-043-23/+19
| | | | | (cherry picked from commit afbeb58c1626c3ba35041c834622c8134d0275e7) Co-authored-by: Mario <mario@mariovavti.com>
* Reflect change to btn-link in js templateMario2024-10-041-1/+1
| | | | | (cherry picked from commit 8ffab25f5d848bb8b788c97cf7ec206729fc015a) Co-authored-by: Mario <mario@mariovavti.com>
* Fix modal backdrop not removed when like/unlike from the modalMario2024-10-041-0/+3
| | | | | (cherry picked from commit 7d41deebce656a3812cea6556123e5c5805196da) Co-authored-by: Mario <mario@mariovavti.com>
* Fix missing handle icon in mod pdledit_guiMario2024-10-041-1/+1
| | | | | (cherry picked from commit 7e48caae6b104896e0b6bf95cf834d03962fdc09) Co-authored-by: Mario <mario@mariovavti.com>
* Merge branch 'master' of https://framagit.org/hubzilla/coreMario2024-10-031-2/+2
|\
| * Tests: Unbreak help test.Mario2024-10-021-2/+2
| | | | | | | | | | (cherry picked from commit 5b93aa1148d647026b309e4f9e0eeca4f09d53ee) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* | version 9.4.1Mario2024-10-031-1/+1
|/
* changelogMario2024-10-021-0/+9
| | | | | (cherry picked from commit 9008760aa616752c109878187d835fcbfad49018) Co-authored-by: Mario <mario@mariovavti.com>
* Help: Drop language specifier in URL when redirectingMario2024-10-021-2/+2
| | | | | | | | This finally fixes the help for languages other than english. (cherry picked from commit 4daa03f025505fc6f98f6a169cf743df1b958741) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* Replace drop shadow in help toc with brighter color.Mario2024-10-021-2/+2
| | | | | | | | | | 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 8ae9df3bb7ab76bf8c1f864ac6c4869366e8b497) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* Move some help related styling from redbasic to module css.Mario2024-10-022-14/+14
| | | | | (cherry picked from commit 25d9d3ba1b6eed803c838f8cbfb67fb9b60e9185) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* Use html details element for toc on top of help pages.Mario2024-10-023-19/+12
| | | | | | | | | 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 26ce231951e62f1912d457c8f6e6b0f2092173f1) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* Remove link to "Contents" from the help table of contect sidebar.Mario2024-10-021-2/+4
| | | | | | | | | 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 fb9464437e68c13474409c969f934afe13768649) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* deps: Upgrade smarty/smarty to version 4.5.4Mario2024-10-0213-106/+95
| | | | | | | | | | | | | | | | | | | | | | | 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 - https://github.com/smarty-php/smarty/commit/0be92bc8a6fb83e6e0d883946f7e7c09ba4e857a 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 4dff1a1e5b6d1117cf3a8ad9924d38fb7d01b687) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* fix german about page titleMario2024-10-021-1/+1
| | | | | (cherry picked from commit 1c45030c583d8a165bac81e52eab5ee209e398b5) Co-authored-by: Mario <mario@mariovavti.com>
* markdown: Don't link URLs in code blocks.Mario2024-10-023-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 a1ccacb825edac6ae36e5db4f62ebfe7aeaebe9f 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 a1ccacb825edac6ae36e5db4f62ebfe7aeaebe9f, 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 803cd74b4881a617a56be4fb5780d6d25fd5433f) Co-authored-by: Harald Eilertsen <haraldei@anduin.net>
* rewrite sql logic to rename photos - there are more DB queries involved now ↵Mario2024-10-021-21/+19
| | | | | | | but the previous logic was throwing error in postgresql (while the result was correct anyway) (cherry picked from commit a5f0253aef7784ace13fa6bd87048b86d9cd50c3) Co-authored-by: Mario Vavti <mario@mariovavti.com>
* adjust post app icon and remove obsolete argumentsMario2024-09-271-3/+3
| | | | | (cherry picked from commit 5cbd42bbc4de4cbae68148868525fe0c5952cee5) Co-authored-by: Mario <mario@mariovavti.com>
* Merge branch '9.4RC'Mario2024-09-254413-16042/+52203
|\
| * version 9.4Mario2024-09-251-1/+1
| |
| * update changelogMario2024-09-251-1/+1
| | | | | | | | | | (cherry picked from commit 5281f4dd9bef5275c2b0f377b6d6768fadc1b8a6) Co-authored-by: Mario <mario@mariovavti.com>
| * update changelogMario2024-09-251-0/+3
| | | | | | | | | | (cherry picked from commit 424b31b7f093f6264ce11a259cff4953696b20de) Co-authored-by: Mario <mario@mariovavti.com>
| * Merge branch 'dev' into 9.4RCMario2024-09-241-1/+2
| |\
| | * mod help: only abort requests without topic if we have not got a search requestMario2024-09-241-1/+2
| | |
| * | version 9.4RC1Mario2024-09-241-1/+1
| | |
| * | Merge branch 'dev' into 9.4RCMario2024-09-242-1/+5
| |\|
| | * update changelogMario2024-09-241-0/+4
| | |
| | * notes: make sure we set App::$profile_uid in the module - issue #1865 and ↵Mario Vavti2024-09-222-15/+24
| | | | | | | | | | | | minor code cleanup
| | * bump dev versionMario Vavti2024-09-201-1/+1
| | |
| * | notes: make sure we set App::$profile_uid in the module - issue #1865 and ↵Mario2024-09-222-15/+24
| |/ | | | | | | | | | | | | minor code cleanup (cherry picked from commit 3733a80c1de0e3bf69b91f1dc7ee217fd3e29fe5) Co-authored-by: Mario Vavti <mario@mariovavti.com>
| * version 9.4RC, strings, autoload dumpMario Vavti2024-09-202-7969/+8106
| |
| * changelogMario2024-09-201-0/+30
| |
| * whitespaceMario2024-09-191-1/+0
| |
| * prefer token if availableMario2024-09-192-16/+15
| |
| * display title only for toplevel itemsMario2024-09-181-1/+1
| |
| * Adjust fix_attached_permissions() so that if we got a token, we will just ↵Mario2024-09-182-8/+18
| | | | | | | | add the token to the original ACL instead of rewriting the ACL to theitem ACL - it probably makes much more sense that way
| * remove garbageMario2024-09-181-5/+0
| |
| * not yet ready for primetimeMario2024-09-182-1/+6
| |
| * allow uploading to comments if ocap tokens are enabledMario2024-09-181-7/+13
| |
| * refactor get_security_ids() to remove some legacy code from the zot/zot6 ↵Mario2024-09-181-36/+41
| | | | | | | | transition and re-add scope sql to item_permissions_sql()
| * fa2bi fixesMario2024-09-052-5/+5
| |