diff --git a/NT/elogd.sln b/NT/elogd.sln index 2fcfe4a8..38876c96 100755 --- a/NT/elogd.sln +++ b/NT/elogd.sln @@ -9,6 +9,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locext", "locext.vcproj", "{77ED3530-9382-4830-8513-9729C051A93E}" EndProject Global + GlobalSection(SubversionScc) = preSolution + Svn-Managed = True + Manager = AnkhSVN - Subversion Support for Visual Studio + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 diff --git a/checklist.txt b/checklist.txt index 6272bb9d..9ca24b19 100755 --- a/checklist.txt +++ b/checklist.txt @@ -23,7 +23,6 @@ On midas.psi.ch: Declare new version at freshmeat. - Checklist for new ELOG intermediate release =========================================== diff --git a/doc/ChangeLog b/doc/ChangeLog index 377ce311..081cd24a 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,22 @@ +Version 2.7.5, released Sept. 22th 2008 +======================================= + +- Added msvcr71.dll to Windows distribution +- Fixed problem with quick filters and ^xxx$ search +- Fixed bug which could crash elogd +- Added "past-n" to display last n hours +- Encode command line if it contains a '<' +- Evaluate "skiplock" parameter to make elog submissions work with "use lock=1" +- encoded logbook in case it contains blanks +- added "skiplock" parameter to make elog work with "use lock=1" +- Call _exit in my_shell to prevent calling of cleanup() +- Search for whole words in quick filter using ^*$ regular expression +- Made preset of $user_email work with attributes of type useremail +- Added code to check for invalid URL in the form 'http://server//xyz' +- Do not go into infite loop for interrupted POST transfer +- Added sorting for muserlist and museremail +- Made quick filter work with icons + Version 2.7.4, released June 9th, 2008 ====================================== diff --git a/doc/index.html b/doc/index.html index 5f77e73e..543755f2 100755 --- a/doc/index.html +++ b/doc/index.html @@ -28,7 +28,7 @@  [Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
Current version is : 2.7.4
+
Current version is : 2.7.5
certificate
diff --git a/doc/index_d.html b/doc/index_d.html index baba6fd8..8582e4c6 100644 --- a/doc/index_d.html +++ b/doc/index_d.html @@ -28,7 +28,7 @@  [Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
Current version is : 2.7.3
+
Current version is : 2.7.5
certificate diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian index 3947efa9..7b2934ce 100755 --- a/resources/eloglang.brazilian +++ b/resources/eloglang.brazilian @@ -447,7 +447,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian index a3da5fcb..c859805e 100755 --- a/resources/eloglang.bulgarian +++ b/resources/eloglang.bulgarian @@ -447,7 +447,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.czech b/resources/eloglang.czech index ad83dbbd..ee5ec78b 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -445,7 +445,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.danish b/resources/eloglang.danish index e6c07b00..c83dc9f5 100755 --- a/resources/eloglang.danish +++ b/resources/eloglang.danish @@ -445,7 +445,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch index c0e9b5ad..c361d994 100755 --- a/resources/eloglang.dutch +++ b/resources/eloglang.dutch @@ -443,7 +443,6 @@ XML Import = XML import A old entry has been updated on %s = Een oud bericht is vernieuwd op %s This entry has in meantime been locked by %s = Dit bericht is intussen geblokkeerd door %s This entry has in meantime been modified by someone else = Dit bericht is intussen geblokkeerd door iemand anders -Submitting it now would overwrite the other modification and is therefore prohibited = Nu versturen zou een andere wijziging overschrijven en is daarom niet toegestaan First entry, Ctrl-Home = Eerste bericht, Ctrl-Home Previous entry, Ctrl-PgUp = Vorige bericht, Ctrl-PgUp Next entry, Ctrl-PgDn = Volgende bericht, Ctrl-PgDn diff --git a/resources/eloglang.french b/resources/eloglang.french index 33fbcbcb..474371f8 100755 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -441,7 +441,6 @@ XML Import = Import XML A old entry has been updated on %s = Un ancienne entrée a été mise à jour sur %s This entry has in meantime been locked by %s = Cette entrée a été verrouillée entre temps sur %s This entry has in meantime been modified by someone else = Cette entrée a été modifiée entre temps par quelqu'un d'autre -Submitting it now would overwrite the other modification and is therefore prohibited = La valider maintenant écraserait l'autre modification et n'est donc pas autorisé First entry, Ctrl-Home = Première entrée, Ctrl-Home Previous entry, Ctrl-PgUp = Entrée précédente, Ctrl-PgUp Next entry, Ctrl-PgDn = Entrée suivante, Ctrl-PgDn diff --git a/resources/eloglang.german b/resources/eloglang.german index e619358c..50d98d36 100755 --- a/resources/eloglang.german +++ b/resources/eloglang.german @@ -440,7 +440,6 @@ XML Import = XML Import A old entry has been updated on %s = Ein alter Eintrag wurde auf %s erneuert This entry has in meantime been locked by %s = Dieser Eintrag wurde in der Zwischenzeit von %s gesperrt This entry has in meantime been modified by someone else = Dieser Eintrag wurde in der Zwischenzeit von jemandem andern geändert -Submitting it now would overwrite the other modification and is therefore prohibited = Jetzt abschicken würde die andere Änderung überscheiben und ist deshalb verboten First entry, Ctrl-Home = Erster Eintrag, Strg-Pos1 Previous entry, Ctrl-PgUp = Vorheriger Eintrag, Strg-BildHoch Next entry, Ctrl-PgDn = Nächster Eintrag, Strg-BildRunter diff --git a/resources/eloglang.italian b/resources/eloglang.italian index 9bc47d8a..1425fb3c 100755 --- a/resources/eloglang.italian +++ b/resources/eloglang.italian @@ -443,7 +443,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese index bc6f5e17..fec5d5a9 100755 --- a/resources/eloglang.japanese +++ b/resources/eloglang.japanese @@ -443,7 +443,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.ru_CP1251 b/resources/eloglang.ru_CP1251 index 426ac9fc..46d0b56e 100644 --- a/resources/eloglang.ru_CP1251 +++ b/resources/eloglang.ru_CP1251 @@ -449,7 +449,6 @@ Enter heading level (1, 2 or 3) = Insert anchor point = Âñòàâèòü ÿêîðü Derive attributes from XML file = Èçâëå÷ü àòðèáóòû èç XML ôàéëà XML import preview of %s = Ïðåäïðîñìîòð XML èìïîðòà %s -Submitting it now would overwrite the other modification and is therefore prohibited = Çàïðåùåíî, ïîòîìó ÷òî ñåé÷àñ ìîæåò ïåðåïèñàòü äðóãóþ ìîäèôèêàöèþ. or until I log out = èëè ïîêà ÿ íå âûéäó Show HTML source code = Ïîêàçàòü èñõîäíûé êîä HTML Cannot send email notification to "%s" = Íå óäàåòñÿ îòïðàâèòü óâåäîìëåíèå äëÿ "%s" diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish index 3e03dfca..47f5ac5a 100755 --- a/resources/eloglang.spanish +++ b/resources/eloglang.spanish @@ -441,7 +441,6 @@ XML Import = Importar XML A old entry has been updated on %s = Una entrada anterior ha sido actualizada en %s This entry has in meantime been locked by %s = Esta entrada ha sido bloqueada por %s This entry has in meantime been modified by someone else = Esta entrada ha sido modificada por alguien mas mientras se escribia -Submitting it now would overwrite the other modification and is therefore prohibited = Enviar esto ahora sobreescribiria la otra modificacion, por lo tanto no esta permitido First entry, Ctrl-Home = Primera entrada, Ctrl-Home Previous entry, Ctrl-PgUp = Entrada anterior, Ctrl-PgUp Next entry, Ctrl-PgDn = Entrada siguiente, Ctrl-PgDn diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish index 31fca3fd..f2fe94e6 100644 --- a/resources/eloglang.swedish +++ b/resources/eloglang.swedish @@ -445,7 +445,6 @@ XML Import = XML-Import A old entry has been updated on %s = En gammal post har uppdaterats på %s This entry has in meantime been locked by %s = Denna post har under tiden låsts av %s This entry has in meantime been modified by someone else = Denna post har under tiden ändrats av någon annan -Submitting it now would overwrite the other modification and is therefore prohibited = Om den sparas nu skulle den andra ändringen skrivas över och är därför inte tillåtet First entry, Ctrl-Home = Första posten, Ctrl-Home Previous entry, Ctrl-PgUp = Föregående post, Ctrl-PgUp Next entry, Ctrl-PgDn = Nästa post, Ctrl-PgDn diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish index 9a87ff22..5ad7ae97 100755 --- a/resources/eloglang.turkish +++ b/resources/eloglang.turkish @@ -447,7 +447,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312 index 9ad119e1..5895c99c 100644 --- a/resources/eloglang.zh_CN-GB2312 +++ b/resources/eloglang.zh_CN-GB2312 @@ -446,7 +446,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8 index 757e807c..403f869e 100644 --- a/resources/eloglang.zh_CN-UTF8 +++ b/resources/eloglang.zh_CN-UTF8 @@ -446,7 +446,6 @@ XML Import = A old entry has been updated on %s = This entry has in meantime been locked by %s = This entry has in meantime been modified by someone else = -Submitting it now would overwrite the other modification and is therefore prohibited = First entry, Ctrl-Home = Previous entry, Ctrl-PgUp = Next entry, Ctrl-PgDn = diff --git a/src/elog.c b/src/elog.c index 545aa463..10da1ed2 100755 --- a/src/elog.c +++ b/src/elog.c @@ -9,7 +9,7 @@ \********************************************************************/ -#define VERSION "2.7.3" +#define VERSION "2.7.5" char svn_revision[] = "$Id$"; /* ELOG identification */ diff --git a/src/elogd.c b/src/elogd.c index fad3a80a..6c8c7d98 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -9,7 +9,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.7.4" +#define VERSION "2.7.5" char svn_revision[] = "$Id$"; /* ELOG identification */ @@ -5801,102 +5801,136 @@ PATTERN_LIST pattern_list[] = { /* smileys */ { - ":))", "\"Happy\""}, { - ":-))", "\"Happy\""}, { - ":)", "\"Smile\""}, { - ":-)", "\"Smile\""}, { - ":(", "\"Frown\""}, { - ":-(", "\"Frown\""}, { - ";)", "\"Wink\""}, { - ";-)", "\"Wink\""}, { - ":d", "\"Big"}, { - "?-)", "\"Confused\""}, { - ";(", "\"Crying\""}, { - ";-(", "\"Crying\""}, { - ":]", "\"Pleased\""}, { - ":-]", "\"Pleased\""}, { - ":o", "\"Yawn\""}, { - ":-o", "\"Yawn\""}, { - "8-)", "\"Cool\""}, { - "8o", "\"Astonished\""}, { - "x-(", "\"Mad\""}, { - ":p", "\"Tongue\""}, { - ":-p", "\"Tongue\""}, - /* formatting */ + ":))", "\"Happy\""}, { + ":-))", + "\"Happy\""}, { - "[b]", ""}, { - "[/b]", ""}, { - "[u]", ""}, { - "[/u]", ""}, { - "[i]", ""}, { - "[/i]", ""}, { - "[center]", "
"}, { - "[/center]", "
"}, { - "[color=", ""}, { - "[/color]", ""}, { - "[size=", ""}, { - "[/size]", ""}, { - "[font=", ""}, { - "[/font]", ""}, { - "\r\n[code]", "
"}, {
-   "[code]", "
"}, {
-   "[/code]\r\n", "
"}, {
-   "[/code]", "
"}, { - "\r\n[code1]", "
"}, {
-   "[code1]", "
"}, {
-   "[/code1]\r\n", "
"}, {
-   "[/code1]", "
"}, - /* lists */ + ":)", "\"Smile\""}, { + ":-)", + "\"Smile\""}, { - "[list]\r", "