[Web/master] Temporarily change passwords back again
commit 43612a857a5c6199ffdb852fb104c626c1cf3571 Author: Richard Kimberly Heck Date: Sun May 19 00:58:08 2024 -0400 Temporarily change passwords back again --- farm/farmconfig.php | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/farm/farmconfig.php b/farm/farmconfig.php index fd93cf86..464bf907 100644 --- a/farm/farmconfig.php +++ b/farm/farmconfig.php @@ -34,10 +34,10 @@ include_once($FarmD.'/scripts/xlpage-utf-8.php'); ## e.g. http://www.lyx.org/...?action=crypt # # CHR 2012-03-20: I regenerated encrypted passwords on the new server -#$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; -$DefaultPasswords['edit'] = '$2y$10$EfW6hOFNzOePkSvGShLiweIvA42g8OBq9SpLA1TLuc5YT87Ff6.lS'; -#$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; -$DefaultPasswords['admin'] = '$2y$10$hflsQfoaMahlpwUTuk8FFOvcabJwRyrFt22NYYALu5u8GdTPn42NC'; +$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; +#$DefaultPasswords['edit'] = '$2y$10$EfW6hOFNzOePkSvGShLiweIvA42g8OBq9SpLA1TLuc5YT87Ff6.lS'; +$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; +#$DefaultPasswords['admin'] = '$2y$10$hflsQfoaMahlpwUTuk8FFOvcabJwRyrFt22NYYALu5u8GdTPn42NC'; ## If you want to use URLs of the form .../pmwiki.php/Group/PageName ## instead of .../pmwiki.php?p=Group.PageName, try setting -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[Web/master] Restore new passwords
commit ffe823a112dfa5b3e81054e0ecfb7b933566ec1c Author: Richard Kimberly Heck Date: Sat May 18 19:33:23 2024 -0400 Restore new passwords --- farm/farmconfig.php | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/farm/farmconfig.php b/farm/farmconfig.php index 464bf907..fd93cf86 100644 --- a/farm/farmconfig.php +++ b/farm/farmconfig.php @@ -34,10 +34,10 @@ include_once($FarmD.'/scripts/xlpage-utf-8.php'); ## e.g. http://www.lyx.org/...?action=crypt # # CHR 2012-03-20: I regenerated encrypted passwords on the new server -$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; -#$DefaultPasswords['edit'] = '$2y$10$EfW6hOFNzOePkSvGShLiweIvA42g8OBq9SpLA1TLuc5YT87Ff6.lS'; -$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; -#$DefaultPasswords['admin'] = '$2y$10$hflsQfoaMahlpwUTuk8FFOvcabJwRyrFt22NYYALu5u8GdTPn42NC'; +#$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; +$DefaultPasswords['edit'] = '$2y$10$EfW6hOFNzOePkSvGShLiweIvA42g8OBq9SpLA1TLuc5YT87Ff6.lS'; +#$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; +$DefaultPasswords['admin'] = '$2y$10$hflsQfoaMahlpwUTuk8FFOvcabJwRyrFt22NYYALu5u8GdTPn42NC'; ## If you want to use URLs of the form .../pmwiki.php/Group/PageName ## instead of .../pmwiki.php?p=Group.PageName, try setting -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[Web/master] Temporarily reset password
commit a3ccd7d82bba98aae2a0cfebdc270c3d8844682e Author: Richard Kimberly Heck Date: Sat May 18 19:25:19 2024 -0400 Temporarily reset password --- farm/farmconfig.php | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/farm/farmconfig.php b/farm/farmconfig.php index fd93cf86..464bf907 100644 --- a/farm/farmconfig.php +++ b/farm/farmconfig.php @@ -34,10 +34,10 @@ include_once($FarmD.'/scripts/xlpage-utf-8.php'); ## e.g. http://www.lyx.org/...?action=crypt # # CHR 2012-03-20: I regenerated encrypted passwords on the new server -#$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; -$DefaultPasswords['edit'] = '$2y$10$EfW6hOFNzOePkSvGShLiweIvA42g8OBq9SpLA1TLuc5YT87Ff6.lS'; -#$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; -$DefaultPasswords['admin'] = '$2y$10$hflsQfoaMahlpwUTuk8FFOvcabJwRyrFt22NYYALu5u8GdTPn42NC'; +$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; +#$DefaultPasswords['edit'] = '$2y$10$EfW6hOFNzOePkSvGShLiweIvA42g8OBq9SpLA1TLuc5YT87Ff6.lS'; +$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; +#$DefaultPasswords['admin'] = '$2y$10$hflsQfoaMahlpwUTuk8FFOvcabJwRyrFt22NYYALu5u8GdTPn42NC'; ## If you want to use URLs of the form .../pmwiki.php/Group/PageName ## instead of .../pmwiki.php?p=Group.PageName, try setting -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Make comment clearer.
commit e3f2b10842cdc808e9f2bf235692f283009d3734
Author: Thibaut Cuvelier
Date: Sat May 18 19:38:52 2024 +0200
Make comment clearer.
---
src/insets/InsetInfo.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index cfb5b7eafc..4ed6142430 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -1563,7 +1563,7 @@ void xhtmlShortcutInfo(XMLStream & xs, const
InsetInfoParams & params) {
sequence = theTopLevelKeymap().printBindings(func,
KeySequence::ForGui);
seq_untranslated = theTopLevelKeymap().printBindings(func,
KeySequence::ForGui, true);
}
- // No other possible case.
+ // No other possible case (`return` at the beginning of the function
otherwise).
Language const * tryguilang =
languages.getFromCode(Messages::guiLanguage());
// Some info insets use the language of the GUI (if available)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] InsetInfo: no need to output + explicitly in a shortcut, it is already contained in the sequence.
commit 7cfe36e6aa4460ae8641cd36f4aab5f013390326
Author: Thibaut Cuvelier
Date: Sat May 18 19:41:44 2024 +0200
InsetInfo: no need to output + explicitly in a shortcut, it is already
contained in the sequence.
---
src/insets/InsetInfo.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 4ed6142430..7ed5662b10 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -1589,9 +1589,6 @@ void xhtmlShortcutInfo(XMLStream & xs, const
InsetInfoParams & params) {
} else {
xs << c;
}
-
- if (i > 0 && i + 1 < sequence.length())
- xs << from_ascii("+");
}
xml::closeTag(xs, "bdo", "inline");
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Update sk.po
commit de521e9ab539d0a699ad52a8a61447cb7dc921a0 Author: Kornel Benko Date: Sat May 18 19:19:47 2024 +0200 Update sk.po --- po/sk.po | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/po/sk.po b/po/sk.po index 366eded170..f5a3c0e3ea 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,13 +3,13 @@ # # Zdenko Podobný , 2003, 2006. # Kornel Benko , 2009. -# Kornel Benko , 2009-2023. +# Kornel Benko , 2009-2024. msgid "" msgstr "" "Project-Id-Version: LyX-2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2024-05-02 10:57-0400\n" -"PO-Revision-Date: 2023-11-07 11:48+\n" +"POT-Creation-Date: 2024-05-18 19:16+0200\n" +"PO-Revision-Date: 2024-05-18 17:17+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -24970,6 +24970,10 @@ msgstr "LyX 2.1.x" msgid "LyX 2.2.x" msgstr "LyX 2.2.x" +#: lib/configure.py:809 +msgid "LyX 2.4.x" +msgstr "LyX 2.4.x" + #: lib/configure.py:809 msgid "CJK LyX 1.4.x (big5)" msgstr "CJK LyX 1.4.x (big5)" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[Web/master] New edit passwords
commit 9b0e9587c65926661e2d252638daa158398900bc Author: sanda Date: Sat May 18 10:54:29 2024 + New edit passwords --- farm/farmconfig.php | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/farm/farmconfig.php b/farm/farmconfig.php index 50a97842..fd93cf86 100644 --- a/farm/farmconfig.php +++ b/farm/farmconfig.php @@ -34,8 +34,10 @@ include_once($FarmD.'/scripts/xlpage-utf-8.php'); ## e.g. http://www.lyx.org/...?action=crypt # # CHR 2012-03-20: I regenerated encrypted passwords on the new server -$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; -$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; +#$DefaultPasswords['edit'] = '$1$JdM/pQWm$m34rd06MIc3E6qYSq6pgv0'; +$DefaultPasswords['edit'] = '$2y$10$EfW6hOFNzOePkSvGShLiweIvA42g8OBq9SpLA1TLuc5YT87Ff6.lS'; +#$DefaultPasswords['admin'] = '$1$uPRnDPcC$zXvHogNHHT7xov3ID0d1b0'; +$DefaultPasswords['admin'] = '$2y$10$hflsQfoaMahlpwUTuk8FFOvcabJwRyrFt22NYYALu5u8GdTPn42NC'; ## If you want to use URLs of the form .../pmwiki.php/Group/PageName ## instead of .../pmwiki.php?p=Group.PageName, try setting -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[Web/master] few more php fixes
commit 7fa988fbf0f5bfba31418a3e6133cf5631283be7
Author: sanda
Date: Sat May 18 10:54:10 2024 +
few more php fixes
---
farm/cookbook/pagetoc.php | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/farm/cookbook/pagetoc.php b/farm/cookbook/pagetoc.php
index 7c584ae3..5952b672 100644
--- a/farm/cookbook/pagetoc.php
+++ b/farm/cookbook/pagetoc.php
@@ -229,6 +229,7 @@ SDV($TocBackFmt,' Contents');
Markup('tocback','directives','/\(:toc-back(?:\s+(.*?))?:\)/',"TocLinkText");
Markup('tocpage','directives','/\(:toc-page\s+(.*?)(?:\s+self=([01]))?:\)/',
function ($m) use (&$pagename) {
+ SDV($m[2], '');
return RemoteTableOfContents($pagename,$m[1],$m[2]);
});
@@ -285,9 +286,11 @@ function RemoteTableOfContents($pagename,$ref,$self=0) {
$toctext=@$tocpage['text'];
if (strpos($toctext, '(:nogroupheader:)')===false)
$toctext = $GLOBALS['GroupHeaderFmt'].$toctext;
-if
(preg_match('/\(:([#\*])?toc(?:-(float|hide))?(?:\s+anchors=(v)isible)?(?:\s+(.*?))?(?:\s+(Q))?:\)(.*)$/se',$toctext,$m))
+if
(preg_match('/\(:([#\*])?toc(?:-(float|hide))?(?:\s+anchors=(v)isible)?(?:\s+(.*?))?(?:\s+(Q))?:\)(.*)$/s',$toctext,$m))
$toc = str_replace('[[#',"[[$ref#",
TableOfContents($tocname,$m[1],'page','',$m[5],PSS($m[6])));
+else
+ $toc = '';
$TocHeaderFmt = $oTocHeader;
return $toc;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[Web/master] Allow redirection from lyx.org/Downloads/
commit d5c5b7e75ba23633c4e857d88317e0ed1e101c9f
Author: sanda
Date: Sat May 18 10:52:55 2024 +
Allow redirection from lyx.org/Downloads/
---
config.php| 3 +++
wiki.d/Download.Download | 28
wiki.d/Download.RecentChanges | 9 +
3 files changed, 40 insertions(+)
diff --git a/config.php b/config.php
index 94687cd2..9c8c1a3c 100644
--- a/config.php
+++ b/config.php
@@ -125,3 +125,6 @@ if ($action == 'edit' || $action == 'comment' || $action ==
'diff') {
include_once("$FarmD/cookbook/cmsb-blocklist.php");
}
}
+
+#Allow silent redirect from "Download/", ie: Download.Download -> Download
+$EnableRedirectQuiet = 1;
diff --git a/wiki.d/Download.Download b/wiki.d/Download.Download
new file mode 100644
index ..cb3ea431
--- /dev/null
+++ b/wiki.d/Download.Download
@@ -0,0 +1,28 @@
+version=pmwiki-2.3.31 ordered=1 urlencoded=1
+agent=Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Goanna/6.6
Firefox/102.0 PaleMoon/33.0.2
+author=ps
+charset=UTF-8
+csum=
+ctime=1716019550
+host=86.49.236.202
+name=Download.Download
+rev=5
+targets=
+text=(:redirect Web.Download quiet=1:)
+time=1716019812
+author:1716019812=ps
+diff:1716019812:1716019605:=1c1%0a%3c (:redirect Web.Download quiet=1:)%0a\ No
newline at end of file%0a---%0a> (:redirect Web.Download:)%0a\ No newline at
end of file%0a
+host:1716019812=86.49.236.202
+author:1716019605=ps
+diff:1716019605:1716019594:=1c1%0a%3c (:redirect Web.Download:)%0a\ No newline
at end of file%0a---%0a> (:redirect ../Web.Download:)%0a\ No newline at end of
file%0a
+host:1716019605=86.49.236.202
+author:1716019594=ps
+diff:1716019594:1716019568:=1c1%0a%3c (:redirect ../Web.Download:)%0a\ No
newline at end of file%0a---%0a> (:redirect ../Download:)%0a\ No newline at end
of file%0a
+host:1716019594=86.49.236.202
+author:1716019568=ps
+diff:1716019568:1716019550:=1c1%0a%3c (:redirect ../Download:)%0a\ No newline
at end of file%0a---%0a> (:redirect Download:)%0a\ No newline at end of file%0a
+host:1716019568=86.49.236.202
+author:1716019550=ps
+csum:1716019550=try to fix download/
+diff:1716019550:1716019550:=1d0%0a%3c (:redirect Download:)%0a\ No newline at
end of file%0a
+host:1716019550=86.49.236.202
diff --git a/wiki.d/Download.RecentChanges b/wiki.d/Download.RecentChanges
new file mode 100644
index ..673bc3cb
--- /dev/null
+++ b/wiki.d/Download.RecentChanges
@@ -0,0 +1,9 @@
+version=pmwiki-2.3.31 ordered=1 urlencoded=1
+agent=Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Goanna/6.6
Firefox/102.0 PaleMoon/33.0.2
+charset=UTF-8
+ctime=1716019550
+host=86.49.236.202
+name=Download.RecentChanges
+rev=5
+text=* [[Download/Download]] . . . @2024-05-18T08:10:12Z by [[~ps]]: [==]%0a
+time=1716019812
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Cmake build: Set LYX_DATA_SUBDIR in cache unconditionaly
commit 6670870aa3a426df0e46a5110f10cb6388ff77ff
Author: Kornel Benko
Date: Sat May 18 10:27:54 2024 +0200
Cmake build: Set LYX_DATA_SUBDIR in cache unconditionaly
The value is wrong if CMakeCache.txt already exists and the version is
changed inside configure.ac in AC_INIT()
---
CMakeLists.txt | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a843029f2..228ef34a2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,12 +580,10 @@ endif()
-if(NOT LYX_DATA_SUBDIR)
- if (WIN32)
- set(LYX_DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for
all lyx-system-data" FORCE)
- else()
- set(LYX_DATA_SUBDIR "share/${_lyx}/" CACHE STRING "Subdirectory
for all lyx-system-data" FORCE)
- endif()
+if (WIN32)
+ set(LYX_DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for all
lyx-system-data" FORCE)
+else()
+ set(LYX_DATA_SUBDIR "share/${_lyx}/" CACHE STRING "Subdirectory for all
lyx-system-data" FORCE)
endif()
set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}/${LYX_DATA_SUBDIR}")
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
