diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index 6b291ebf6..10f346e74 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -95,6 +95,10 @@ Settings/LinkToBehaviour/OpenAbove: Open above the current tiddler Settings/LinkToBehaviour/OpenBelow: Open below the current tiddler Settings/LinkToBehaviour/OpenAtTop: Open at the top of the story river Settings/LinkToBehaviour/OpenAtBottom: Open at the bottom of the story river +Settings/TitleLinks/Caption: Tiddler Titles +Settings/TitleLinks/Hint: Optionally display tiddler titles as links +Settings/TitleLinks/No/Description: Do not display tiddler titles as links +Settings/TitleLinks/Yes/Description: Display tiddler titles as links StoryView/Caption: Story View StoryView/Prompt: Current view: Theme/Caption: Theme diff --git a/core/ui/ControlPanel/Settings/TitleLinks.tid b/core/ui/ControlPanel/Settings/TitleLinks.tid new file mode 100644 index 000000000..c1acdc7bd --- /dev/null +++ b/core/ui/ControlPanel/Settings/TitleLinks.tid @@ -0,0 +1,10 @@ +title: $:/core/ui/ControlPanel/Settings/TitleLinks +tags: $:/tags/ControlPanel/Settings +caption: {{$:/language/ControlPanel/Settings/TitleLinks/Caption}} + +\define lingo-base() $:/language/ControlPanel/Settings/TitleLinks/ +<$link to="$:/config/Tiddlers/TitleLinks"><> + +<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes"> <> + +<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no"> <> diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid index 0f280d637..1254d8005 100644 --- a/core/ui/ViewTemplate/title.tid +++ b/core/ui/ViewTemplate/title.tid @@ -12,6 +12,8 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<> text="hide"><$transclude tiddler=<>/> +<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}> +<$link> <$set name="foregroundColor" value={{!!color}}> >> <$transclude tiddler={{!!icon}}/> @@ -27,6 +29,8 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$view field="title"/> + + <$reveal type="nomatch" text="" default="" state=<> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes"> diff --git a/core/wiki/config/TitleLinks.tid b/core/wiki/config/TitleLinks.tid new file mode 100644 index 000000000..7012b0d17 --- /dev/null +++ b/core/wiki/config/TitleLinks.tid @@ -0,0 +1,3 @@ +title: $:/config/Tiddlers/TitleLinks + +no \ No newline at end of file diff --git a/editions/tw2/source/tiddlywiki/java/TiddlySaver.class b/editions/tw2/source/tiddlywiki/java/TiddlySaver.class deleted file mode 100755 index 64cac6801..000000000 Binary files a/editions/tw2/source/tiddlywiki/java/TiddlySaver.class and /dev/null differ diff --git a/editions/tw2/source/tiddlywiki/java/TiddlySaver.jar b/editions/tw2/source/tiddlywiki/java/TiddlySaver.jar deleted file mode 100755 index e42d06d3a..000000000 Binary files a/editions/tw2/source/tiddlywiki/java/TiddlySaver.jar and /dev/null differ diff --git a/editions/tw2/source/tiddlywiki/java/TiddlySaver.java b/editions/tw2/source/tiddlywiki/java/TiddlySaver.java deleted file mode 100755 index df7d17316..000000000 --- a/editions/tw2/source/tiddlywiki/java/TiddlySaver.java +++ /dev/null @@ -1,71 +0,0 @@ -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FileWriter; -import java.security.AccessController; -import java.security.PrivilegedAction; - -public class TiddlySaver extends java.applet.Applet { - public String loadFile(final String filename, final String charset) { - return (String)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - try { - if (charset.length() == 0) { - StringBuffer data = new StringBuffer(); - BufferedReader r = new BufferedReader(new FileReader(filename)); - String line; - while ((line = r.readLine()) != null) data.append(line).append("\n"); - r.close(); - return data.toString(); - } else { - File f = new File(filename); - FileInputStream i = new FileInputStream(f); - byte[] b = new byte[(f.length() > Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int)f.length()]; - int offset = 0; - int num = 0; - while (offset < b.length && (num = i.read(b, offset, b.length - offset)) >= 0) { - offset += num; - } - i.close(); - return new String(b, 0, offset, charset); - } - } catch (Exception x) { - x.printStackTrace(); - return null; - } - } - }); - } - public int saveFile(final String filename, final String charset, final String data) { - return ((Integer)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - try { - if (charset.length() == 0) { - int e, s = 0; - BufferedWriter w = new BufferedWriter(new FileWriter(filename)); - do { - e = data.indexOf('\n', s); - if (e == -1) e = data.length(); - w.write(data, s, e - s); - w.newLine(); - s = e + 1; - } while (s < data.length()); - w.close(); - return new Integer(1); - } else { - FileOutputStream o = new FileOutputStream(filename); - o.write(data.getBytes(charset)); - o.close(); - return new Integer(1); - } - } catch (Exception x) { - x.printStackTrace(); - return new Integer(0); - } - } - })).intValue(); - } -} \ No newline at end of file diff --git a/editions/tw2/source/tiddlywiki/java/TiddlySaverVerify.keystore b/editions/tw2/source/tiddlywiki/java/TiddlySaverVerify.keystore deleted file mode 100755 index 65fdce53b..000000000 Binary files a/editions/tw2/source/tiddlywiki/java/TiddlySaverVerify.keystore and /dev/null differ diff --git a/editions/tw2/source/tiddlywiki/java/UnaMesa-2.cer b/editions/tw2/source/tiddlywiki/java/UnaMesa-2.cer deleted file mode 100755 index 677e59757..000000000 --- a/editions/tw2/source/tiddlywiki/java/UnaMesa-2.cer +++ /dev/null @@ -1,38 +0,0 @@ ------BEGIN PKCS #7 SIGNED DATA----- -MIAGCSqGSIb3DQEHAqCAMIACAQExADALBgkqhkiG9w0BBwGggDCCAyIwggKLoAMC -AQICEEtycpHmJVBWKTR1fltuZYgwDQYJKoZIhvcNAQEFBQAwVTELMAkGA1UEBhMC -WkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xHzAdBgNV -BAMTFlRoYXd0ZSBDb2RlIFNpZ25pbmcgQ0EwHhcNMTAwMzA0MDAwMDAwWhcNMTIw -MzAzMjM1OTU5WjBvMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTES -MBAGA1UEBxMJUGFsbyBBbHRvMRAwDgYDVQQKFAdVbmFNZXNhMRMwEQYDVQQLFApU -aWRkbHlXaWtpMRAwDgYDVQQDFAdVbmFNZXNhMIGfMA0GCSqGSIb3DQEBAQUAA4GN -ADCBiQKBgQDy7syNTVAWoApezeC5oKYWsS19uO87TgHcwqAG2R6U8pBVuHoKpzL9 -YpOnwIL3p+l/fHy5T8ghmxdX4d73RtHiHMFIL6ABrSvt/WxUKtyImleBv521pK5P -S0sdBJWgWCSIV76YKxHdHTZfU83rNih1IGzxP+96MflXh4wPsVuvcwIDAQABo4HY -MIHVMAwGA1UdEwEB/wQCMAAwPgYDVR0fBDcwNTAzoDGgL4YtaHR0cDovL2NybC50 -aGF3dGUuY29tL1RoYXd0ZUNvZGVTaWduaW5nQ0EuY3JsMB8GA1UdJQQYMBYGCCsG -AQUFBwMDBgorBgEEAYI3AgEWMB0GA1UdBAQWMBQwDjAMBgorBgEEAYI3AgEWAwIH -gDAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0 -ZS5jb20wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4GBAHgyGc8J -hNHrtizy6e4bWDlYBwVJiGPe1h0qTNrL9qGexHfF9Msik9CYCFHHv0NlatkP0g0L -ZNkR4pTg7QFPBxfV/fh74SxnzadgyX5vsuohC3n7r7XLZy+vh/jeZR2Qt9QTkyxY -AONfQLWpTUvFy6Rqb6KcPmW70s6t7NORkWF1MIIDTjCCAregAwIBAgIBCjANBgkq -hkiG9w0BAQUFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2Fw -ZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGlu -ZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEh -MB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkB -FhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29tMB4XDTAzMDgwNjAwMDAwMFoXDTEz -MDgwNTIzNTk1OVowVTELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25z -dWx0aW5nIChQdHkpIEx0ZC4xHzAdBgNVBAMTFlRoYXd0ZSBDb2RlIFNpZ25pbmcg -Q0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMa4uSdgrwvjkWll236N7ZHm -qvG+1e3+bdQsf9Fwd/smmVe03T8wuNwh6miNgZL8LkuRNYQg8tpKurT85tqI8iDF -IZIJR5WgCRymeb6xTB388YpuVNJpofFMkzpB/n3UZHtjRfdgYB0xHaTp0w+L+24m -JLOo/+XlkNS0wtxQYK5ZAgMBAAGjgbMwgbAwEgYDVR0TAQH/BAgwBgEB/wIBADBA -BgNVHR8EOTA3MDWgM6Axhi9odHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlUHJl -bWl1bVNlcnZlckNBLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwMw -DgYDVR0PAQH/BAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFQcml2YXRl -TGFiZWwyLTE0NDANBgkqhkiG9w0BAQUFAAOBgQB2spzuE58b9i00kpRFczTcjmsu -XPxMfYnrw2jx15kPLh0XyLUWi77NigUG8hlJOgNbBckgjm1S4XaBoMNliiJn5BxT -UzdGv7zXL+t7ntAURWxAIQjiXXV2ZjAe9N+Cii+986IMvx3bnxSimnI3TbB3SOhK -PwnOVRks7+YHJOGv7AAAMQAAAAAAAAA= ------END PKCS #7 SIGNED DATA----- \ No newline at end of file diff --git a/editions/tw2/source/tiddlywiki/java/UnaMesa-3.cer b/editions/tw2/source/tiddlywiki/java/UnaMesa-3.cer deleted file mode 100755 index 193cd2c02..000000000 Binary files a/editions/tw2/source/tiddlywiki/java/UnaMesa-3.cer and /dev/null differ diff --git a/editions/tw2/source/tiddlywiki/java/UnaMesa.old.cer b/editions/tw2/source/tiddlywiki/java/UnaMesa.old.cer deleted file mode 100755 index e460840e3..000000000 Binary files a/editions/tw2/source/tiddlywiki/java/UnaMesa.old.cer and /dev/null differ diff --git a/editions/tw2/source/tiddlywiki/java/build b/editions/tw2/source/tiddlywiki/java/build deleted file mode 100755 index b4bae1a78..000000000 --- a/editions/tw2/source/tiddlywiki/java/build +++ /dev/null @@ -1,5 +0,0 @@ -javac -source 1.2 -target 1.2 -g:none TiddlySaver.java -jar cf TiddlySaver.jar TiddlySaver*.class -# assume you have UnaMesa.keystore in the same directory -# and Passphrase for keystore -jarsigner -keystore UnaMesa.keystore TiddlySaver.jar BidiX diff --git a/editions/tw2/source/tiddlywiki/java/sign.readme b/editions/tw2/source/tiddlywiki/java/sign.readme deleted file mode 100755 index ceaa17b2b..000000000 --- a/editions/tw2/source/tiddlywiki/java/sign.readme +++ /dev/null @@ -1,323 +0,0 @@ - - Readme file for signing TiddlySaver applet - -for verifying see verify.readme file - -1 - HISTORY - -2010 03 06 - BidiX : Signing TiddlySaver.jar with a new Signing Certificate - The files were updated with the new process used for signing (sorry my Macbook was configured in French) - New signed TiddlySaver.jar was tested with Safari 4.0.4 on MacOS 10.6.2 -2008 04 06 - BidiX : documentation -2008 04 06 - BidiX : create TiddlySaverVerify.keystore -2008 03 27 - BidiX : Signing TiddlySaver.jar -2008 03 26 - BidiX : obtaining UnaMesa Signing Certificate -2008 03 17 - BidiX : Issuing a certificate request to Thawte with a BidiX CSR -2003 03 12 - BidiX : Create UnaMesa.keystore with BidiX alias and Private key - - -2 - UNAMESA.KEYSTORE CREATION - -Using this command: ----------------- -> keytool -genkey -keyalg RSA -alias BidiX -keystore UnaMesa.keystore -Tapez le mot de passe du Keystore : -Ressaisissez le nouveau mot de passe : -Quels sont vos pr?nom et nom ? - [Unknown] : BidiX -Quel est le nom de votre unit? organisationnelle ? - [Unknown] : TiddlyWiki -Quelle est le nom de votre organisation ? - [Unknown] : UnaMesa -Quel est le nom de votre ville de r?sidence ? - [Unknown] : Palo Alto -Quel est le nom de votre ?tat ou province ? - [Unknown] : California -Quel est le code de pays ? deux lettres pour cette unit? ? - [Unknown] : US -Est-ce CN=BidiX, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US ? - [non] : OUI - -Sp?cifiez le mot de passe de la cl? pour - (appuyez sur Entr?e s'il s'agit du mot de passe du Keystore) : -Ressaisissez le nouveau mot de passe : ---------------- - -For security reasons the Keystore is kept in a safe place in BidiX environment (BidiX @ bidix.info) - - -3 - CERTICATE REQUEST -Using this command : --------------- -> keytool -certreq -alias BidiX -file certreq -keystore UnaMesa.keystore -storepass "???" -> cat certreq ------BEGIN NEW CERTIFICATE REQUEST----- -MIIBrTCCARYCAQAwbTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcT -... -sxoX+IbLVSs4Ye4HDqFodRkmehWBJsdWpQa/yji72pY+eA3fCgTt57VL+san9pPaLcwPfAiL23cD -R1j/y2RjQYLpE0PH+vQXn26xNeUDo2OONijyG0RLIX57yA== ------END NEW CERTIFICATE REQUEST----- ---------------- -Certificate received ------BEGIN PKCS #7 SIGNED DATA----- -MIAGCSqGSIb3DQEHAqCAMIACAQExADALBgkqhkiG9w0BBwGggDCCAyIwggKLoAMC -... -PwnOVRks7+YHJOGv7AAAMQAAAAAAAAA= ------END PKCS #7 SIGNED DATA----- -copied in UnaMesa-2.cer - -4 - ADDING CERTICATE TO KEYSTORE ---------------- -> keytool -import -alias BidiX -trustcacerts -file UnaMesa-2.cer -keystore UnaMesa.keystore -Tapez le mot de passe du Keystore : -R?ponse de certificat install?e dans le Keystore ---------------- -List Keystore ---------------- -> keytool -list -v -alias BidiX -keystore UnaMesa.keystore -Tapez le mot de passe du Keystore : -Nom d'alias : BidiX -Date de cr?ation : 6 mars 2010 -Type dentr?e?: {0} -Longueur de cha?ne du certificat : 3 -Certificat[1]: -Propri?taire?: CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US -?metteur?: CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA -Num?ro de s?rie?: 4b727291e62550562934757e5b6e6588 -Valide du?: Thu Mar 04 01:00:00 CET 2010 au?: Sun Mar 04 00:59:59 CET 2012 -Empreintes du certificat?: - MD5?: 1B:79:CE:47:BE:A9:E4:04:2A:DD:04:F5:BA:62:64:AD - SHA1?: 42:A9:6F:4D:C3:20:F8:7F:90:1A:1F:A5:66:92:ED:06:38:19:1E:D4 - Nom de lalgorithme de signature?: {7} - Version?: {8} - -Extensions?: - -#1: ObjectId: 2.5.29.19 Criticality=true -BasicConstraints:[ - CA:false - PathLen: undefined -] - -#2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false -AuthorityInfoAccess [ - [accessMethod: 1.3.6.1.5.5.7.48.1 - accessLocation: URIName: http://ocsp.thawte.com] -] - -#3: ObjectId: 2.5.29.4 Criticality=false - -#4: ObjectId: 2.5.29.31 Criticality=false -CRLDistributionPoints [ - [DistributionPoint: - [URIName: http://crl.thawte.com/ThawteCodeSigningCA.crl] -]] - -#5: ObjectId: 2.5.29.37 Criticality=false -ExtendedKeyUsages [ - codeSigning - 1.3.6.1.4.1.311.2.1.22 -] - -#6: ObjectId: 2.16.840.1.113730.1.1 Criticality=false -NetscapeCertType [ - Object Signing -] - -Certificat[2]: -Propri?taire?: CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA -?metteur?: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -Num?ro de s?rie?: a -Valide du?: Wed Aug 06 02:00:00 CEST 2003 au?: Tue Aug 06 01:59:59 CEST 2013 -Empreintes du certificat?: - MD5?: D4:A7:BF:00:7B:6A:0C:20:D9:23:CD:5B:60:7B:7C:12 - SHA1?: A7:06:BA:1E:CA:B6:A2:AB:18:69:9F:C0:D7:DD:8C:7D:E3:6F:29:0F - Nom de lalgorithme de signature?: {7} - Version?: {8} - -Extensions?: - -#1: ObjectId: 2.5.29.15 Criticality=true -KeyUsage [ - Key_CertSign - Crl_Sign -] - -#2: ObjectId: 2.5.29.19 Criticality=true -BasicConstraints:[ - CA:true - PathLen:0 -] - -#3: ObjectId: 2.5.29.31 Criticality=false -CRLDistributionPoints [ - [DistributionPoint: - [URIName: http://crl.thawte.com/ThawtePremiumServerCA.crl] -]] - -#4: ObjectId: 2.5.29.37 Criticality=false -ExtendedKeyUsages [ - clientAuth - codeSigning -] - -#5: ObjectId: 2.5.29.17 Criticality=false -SubjectAlternativeName [ - CN=PrivateLabel2-144 -] - -Certificat[3]: -Propri?taire?: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -?metteur?: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -Num?ro de s?rie?: 1 -Valide du?: Thu Aug 01 02:00:00 CEST 1996 au?: Fri Jan 01 00:59:59 CET 2021 -Empreintes du certificat?: - MD5?: 06:9F:69:79:16:66:90:02:1B:8C:8C:A2:C3:07:6F:3A - SHA1?: 62:7F:8D:78:27:65:63:99:D2:7D:7F:90:44:C9:FE:B3:F3:3E:FA:9A - Nom de lalgorithme de signature?: {7} - Version?: {8} - -Extensions?: - -#1: ObjectId: 2.5.29.19 Criticality=true -BasicConstraints:[ - CA:true - PathLen:2147483647 -] ---------------- - -5 - SIGNING TIDDLYSAVER.JAR - -Get TiddlySaver.jar from http://trac.tiddlywiki.org/browser/Trunk/core/java/TiddlySaver.jar. -TiddlySaver.jar contained classes compiled on Thu Dec 07 14:48:00 CET 2006 - -With UnaMesa.keystore in the current directory Signing jar on Sam 6 mar 2010 15:16:04 CET using this command : ---------------- -> jarsigner -keystore UnaMesa.keystore TiddlySaver.jar BidiX -Enter Passphrase for keystore: ---------------- - -6 - VERIFYING SIGNATURE WITHOUT KEYSTORE ---------------- -> jarsigner -verify -verbose TiddlySaver.jar - - 284 Thu Mar 27 07:59:12 CET 2008 META-INF/MANIFEST.MF - 395 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.SF - 2798 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.RSA - 0 Thu Dec 07 14:48:00 CET 2006 META-INF/ -sm 1271 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$1.class -sm 1184 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$2.class -sm 775 Thu Dec 07 14:48:00 CET 2006 TiddlySaver.class - - s = signature was verified - m = entry is listed in manifest - k = at least one certificate was found in keystore - i = at least one certificate was found in identity scope - -jar verified. ---------------- - -7 - CREATE TiddlySaverVerify.keystore KEYSTORE -export SigningCertificate ---------------- -> keytool -export -alias BidiX -file UnaMesa-3.cer -keystore UnaMesa.keystore -Tapez le mot de passe du Keystore : -Certificat enregistr? dans le fichier ---------------- -create keystore "TiddlySaverVerify.keystore" with "tiddlywiki" as password and import SigningCertificate ---------------- -> keytool -import -alias BidiX -keystore TiddlySaverVerify.keystore -storepass tiddlywiki -file UnaMesa-3.cer -Propri?taire?: CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US -?metteur?: CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA -Num?ro de s?rie?: 4b727291e62550562934757e5b6e6588 -Valide du?: Thu Mar 04 01:00:00 CET 2010 au?: Sun Mar 04 00:59:59 CET 2012 -Empreintes du certificat?: - MD5?: 1B:79:CE:47:BE:A9:E4:04:2A:DD:04:F5:BA:62:64:AD - SHA1?: 42:A9:6F:4D:C3:20:F8:7F:90:1A:1F:A5:66:92:ED:06:38:19:1E:D4 - Nom de lalgorithme de signature?: {7} - Version?: {8} - -Extensions?: - -#1: ObjectId: 2.5.29.19 Criticality=true -BasicConstraints:[ - CA:false - PathLen: undefined -] - -#2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false -AuthorityInfoAccess [ - [accessMethod: 1.3.6.1.5.5.7.48.1 - accessLocation: URIName: http://ocsp.thawte.com] -] - -#3: ObjectId: 2.5.29.4 Criticality=false - -#4: ObjectId: 2.5.29.31 Criticality=false -CRLDistributionPoints [ - [DistributionPoint: - [URIName: http://crl.thawte.com/ThawteCodeSigningCA.crl] -]] - -#5: ObjectId: 2.5.29.37 Criticality=false -ExtendedKeyUsages [ - codeSigning - 1.3.6.1.4.1.311.2.1.22 -] - -#6: ObjectId: 2.16.840.1.113730.1.1 Criticality=false -NetscapeCertType [ - Object Signing -] - -Faire confiance ? ce certificat ? [non] : Y -R?ponse incorrecte, recommencez -Faire confiance ? ce certificat ? [non] : oui -Certificat ajout? au Keystore ---------------- - -8 - VERIFYING SIGNATURE WITH TiddlySaverVerify.keystore ---------------- -> jarsigner -verify -verbose -certs -keystore TiddlySaverVerify.keystore TiddlySaver.jar - 284 Thu Mar 27 07:59:12 CET 2008 META-INF/MANIFEST.MF - 395 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.SF - 2798 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.RSA - 0 Thu Dec 07 14:48:00 CET 2006 META-INF/ -smk 1271 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$1.class - - X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix) - [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59] - X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA - [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59] - [KeyUsage extension does not support code signing] - X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA - [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59] - -smk 1184 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$2.class - - X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix) - [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59] - X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA - [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59] - [KeyUsage extension does not support code signing] - X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA - [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59] - -smk 775 Thu Dec 07 14:48:00 CET 2006 TiddlySaver.class - - X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix) - [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59] - X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA - [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59] - [KeyUsage extension does not support code signing] - X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA - [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59] - - - s = signature was verified - m = entry is listed in manifest - k = at least one certificate was found in keystore - i = at least one certificate was found in identity scope - -jar verified. ---------------- \ No newline at end of file diff --git a/editions/tw2/source/tiddlywiki/java/verify b/editions/tw2/source/tiddlywiki/java/verify deleted file mode 100755 index 71d4e9431..000000000 --- a/editions/tw2/source/tiddlywiki/java/verify +++ /dev/null @@ -1,2 +0,0 @@ -# assume TiddlySaverVerify.keystore and TiddlySaver.jar in the current directory -jarsigner -verify -verbose -certs -keystore TiddlySaverVerify.keystore -keypass tiddlywiki TiddlySaver.jar diff --git a/editions/tw2/source/tiddlywiki/java/verify.readme b/editions/tw2/source/tiddlywiki/java/verify.readme deleted file mode 100755 index 0f555556f..000000000 --- a/editions/tw2/source/tiddlywiki/java/verify.readme +++ /dev/null @@ -1,46 +0,0 @@ - -Above the verifying command and the expected return: - - -> jarsigner -verify -verbose -certs -keystore TiddlySaverVerify.keystore TiddlySaver.jar - 284 Thu Mar 27 07:59:12 CET 2008 META-INF/MANIFEST.MF - 395 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.SF - 2798 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.RSA - 0 Thu Dec 07 14:48:00 CET 2006 META-INF/ -smk 1271 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$1.class - - X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix) - [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59] - X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA - [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59] - [KeyUsage extension does not support code signing] - X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA - [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59] - -smk 1184 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$2.class - - X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix) - [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59] - X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA - [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59] - [KeyUsage extension does not support code signing] - X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA - [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59] - -smk 775 Thu Dec 07 14:48:00 CET 2006 TiddlySaver.class - - X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix) - [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59] - X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA - [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59] - [KeyUsage extension does not support code signing] - X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA - [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59] - - - s = signature was verified - m = entry is listed in manifest - k = at least one certificate was found in keystore - i = at least one certificate was found in identity scope - -jar verified. diff --git a/editions/tw5.com/tiddlers/community/Meetups.tid b/editions/tw5.com/tiddlers/community/Meetups.tid index 2344dcd56..988beb861 100644 --- a/editions/tw5.com/tiddlers/community/Meetups.tid +++ b/editions/tw5.com/tiddlers/community/Meetups.tid @@ -1,12 +1,13 @@ -title: Meetups created: 20140721121924384 -modified: 20150413121924384 +modified: 20150612100205079 tags: Community +title: Meetups +type: text/vnd.tiddlywiki Local meetings around the world for ~TiddlyWiki people: * [[OXTWIG]], the ''Oxford ~TiddlyWiki Interest Group'' meets monthly in Oxford, UK to share experiences of using TiddlyWiki -* ''[[TiddlyCamp Paris|http://paris.twcamp.info]]'' is an all day celebration and exploration of TiddlyWiki for experienced users and beginners alike. The inaugural meeting is scheduled for 6th June 2015 +* ''[[TiddlyWiki Camp Paris]]'' is an all day celebration and exploration of TiddlyWiki for experienced users and beginners alike //If you are a ~TiddlyWiki enthusiast please consider starting a local TWIG in your area, it's a great way to spread the word about using TiddlyWiki// diff --git a/editions/tw5.com/tiddlers/community/TiddlyWiki_Camp_Paris.tid b/editions/tw5.com/tiddlers/community/TiddlyWiki_Camp_Paris.tid new file mode 100644 index 000000000..8f2925b19 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/TiddlyWiki_Camp_Paris.tid @@ -0,0 +1,11 @@ +created: 20150612095925878 +modified: 20150612100105269 +tags: Meetups +title: TiddlyWiki Camp Paris +type: text/vnd.tiddlywiki + +The first TiddlyWiki Camp Paris was held on Saturday 6th June 2015. + +http://paris.twcamp.info + +> Bienvenue sur le site du TiddlyWiki Camp. Un évènement pour rencontrer la communauté de ce logiciel Open Source, libre et gratuit. Découvrez ce bloc note personnel polyvalent et adoptez-le pour gérer votre quotidien ! \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/EncryptTiddlerPlugin.tid b/editions/tw5.com/tiddlers/community/resources/EncryptTiddlerPlugin.tid new file mode 100644 index 000000000..9ca474010 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/EncryptTiddlerPlugin.tid @@ -0,0 +1,20 @@ +created: 20150602084548184 +modified: 20150602084548184 +tags: Resources +title: "Encrypt single tiddler plugin" by Danielo Rodriguez +type: text/vnd.tiddlywiki +url: http://danielorodriguez.com/TW5-EncryptTiddlerPlugin/ + +A plugin that allows to encrypt your tiddlers individually Danielo Rodriguez. + +{{!!url}} + +<<< +Advantages: + +* You can specify a different password for each tiddler if you want. +* You don't have to encrypt your whole wiky. +* If you forget your password, you only lose a tiddler. +* It's possible to edit the tiddler content , tags and fields except the encrypt field after encryption. +* [...] +<<< diff --git a/editions/tw5.com/tiddlers/images/favicon.ico b/editions/tw5.com/tiddlers/images/favicon.ico index d4fae0448..abf226e9b 100644 Binary files a/editions/tw5.com/tiddlers/images/favicon.ico and b/editions/tw5.com/tiddlers/images/favicon.ico differ diff --git a/editions/tw5.com/tiddlers/saving/Saving with Encryption.tid b/editions/tw5.com/tiddlers/saving/Saving with Encryption.tid index 1d97b8768..880445fd3 100644 --- a/editions/tw5.com/tiddlers/saving/Saving with Encryption.tid +++ b/editions/tw5.com/tiddlers/saving/Saving with Encryption.tid @@ -1,5 +1,5 @@ created: 20130825160900000 -modified: 20140919160407215 +modified: 20150607112027069 tags: Features [[Working with TiddlyWiki]] title: Encryption type: text/vnd.tiddlywiki @@ -15,3 +15,8 @@ When used as a single HTML file, TiddlyWiki5 allows content to be encrypted usin # Optionally, open the saved file in a text editor and verify that your data is encrypted # Open the file in your browser. You will be prompted for a password before the content is displayed + +Note that TiddlyWiki has two other unrelated features concerned with passwords/encryption: + +* The ability to set a password when saving to TiddlySpot. This is done in the "Saving" tab of control panel +* The ability to use standard HTTP basic authentication with the [[Node.js|TiddlyWiki on Node.js]] server configuration. This is done on the command line with the ServerCommand. Combined with SSL, this gives the same level of transit encryption as you'd get with online services like Google or Dropbox, but there is no encryption of data on disk diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid index fb780f47b..278a457c2 100644 --- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid +++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid @@ -12,7 +12,7 @@ released: 20150111 [[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyDesktop/compare/v0.0.3...v0.0.4]] -This release includes a major reworking of the internals of TiddlyDesktop. It's really a bit early for general release, but we need feedback to improve it. Please use it with great caution, and consider reverting to v0.0.3 if you run into any problems. +This release includes a major reworking of the internals of TiddlyDesktop. Please report any problems or suggestions via GitHub issues, or post to the TiddlyWiki discussion group: diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 5ccddfa7d..d1e14bb67 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -228,3 +228,7 @@ vouko, @vouko 2015/05/02 Christian Ehmke, @cehmke 2015/05/10 kixam, @kixam, 2015/05/27 + +Sylvain Naudin, @silvyn, 2015/06/09 + +Lolo le 13 @lolole13 2015/06/04 diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index ea1710446..5f5189619 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1397,7 +1397,6 @@ html body.tc-body.tc-single-tiddler-window { border-left: 1px solid <>; -webkit-flex: 1 0 70%; flex: 1 0 70%; - overflow: auto; } .tc-sidebar-lists .tc-tab-buttons {