cacert-devel.git
6 years agoMerge branch 'release' into bug-1121 bug-1121
Michael Tänzer [Tue, 14 May 2013 23:19:39 +0000 (01:19 +0200)] 
Merge branch 'release' into bug-1121

Conflicts:
www/wot.php

6 years agoMerge branch 'bug-1094' into release
Benny Baumann [Mon, 13 May 2013 18:00:20 +0000 (20:00 +0200)] 
Merge branch 'bug-1094' into release

6 years agoMerge branch 'bug-1171' into release
Benny Baumann [Mon, 13 May 2013 17:58:58 +0000 (19:58 +0200)] 
Merge branch 'bug-1171' into release

6 years agoMerge branch 'bug-1124' into release
Benny Baumann [Mon, 13 May 2013 17:58:16 +0000 (19:58 +0200)] 
Merge branch 'bug-1124' into release

6 years agoMerge branch 'bug-569' into release
Benny Baumann [Mon, 13 May 2013 17:56:34 +0000 (19:56 +0200)] 
Merge branch 'bug-569' into release

6 years agoMerge branch 'bug-740' into release
Benny Baumann [Mon, 13 May 2013 17:53:59 +0000 (19:53 +0200)] 
Merge branch 'bug-740' into release

6 years agoMerge branch 'bug-602' into release
Benny Baumann [Mon, 13 May 2013 17:52:36 +0000 (19:52 +0200)] 
Merge branch 'bug-602' into release

6 years agoMerge branch 'bug-1165' into release
Benny Baumann [Mon, 13 May 2013 17:51:07 +0000 (19:51 +0200)] 
Merge branch 'bug-1165' into release

6 years agoMerge branch 'bug-1154' into release
Benny Baumann [Mon, 13 May 2013 17:48:27 +0000 (19:48 +0200)] 
Merge branch 'bug-1154' into release

6 years agobug 1094: Wrong variable used in error message bug-1094
Michael Tänzer [Tue, 7 May 2013 21:37:34 +0000 (23:37 +0200)] 
bug 1094: Wrong variable used in error message

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1094: changed support@c.o. to mailto link
INOPIAE [Wed, 1 May 2013 12:00:09 +0000 (14:00 +0200)] 
bug 1094: changed support@c.o. to mailto link

6 years agobug 1094: Added new message regarding disputes on organisation domains
INOPIAE [Wed, 1 May 2013 10:34:07 +0000 (12:34 +0200)] 
bug 1094: Added new message regarding  disputes on organisation domains

6 years agobug 1171: Avoid warning if no remote IP is available (e.g. inside a cron script) bug-1171
Wytze van der Raay [Sun, 28 Apr 2013 13:34:37 +0000 (15:34 +0200)] 
bug 1171: Avoid warning if no remote IP is available (e.g. inside a cron script)

6 years agobug 1165: Change wording bug-1165
INOPIAE [Tue, 23 Apr 2013 20:12:44 +0000 (22:12 +0200)] 
bug 1165: Change wording

6 years agobug 740: adjusted ol bug-740
INOPIAE [Tue, 23 Apr 2013 19:50:13 +0000 (21:50 +0200)] 
bug 740: adjusted ol

6 years agobug 740: changed wording
INOPIAE [Tue, 23 Apr 2013 19:46:41 +0000 (21:46 +0200)] 
bug 740: changed wording

6 years agobug 740: Applied changes according to definition of AO
INOPIAE [Tue, 23 Apr 2013 06:18:33 +0000 (08:18 +0200)] 
bug 740: Applied changes according to definition of AO

6 years agobug 1165: Changed link
INOPIAE [Mon, 22 Apr 2013 07:04:16 +0000 (09:04 +0200)] 
bug 1165: Changed link

6 years agoMerge branch 'bug-1159' into release
Benny Baumann [Sun, 21 Apr 2013 21:16:56 +0000 (23:16 +0200)] 
Merge branch 'bug-1159' into release

6 years agobug 1165: Changed text according to bug entry
INOPIAE [Sat, 20 Apr 2013 05:52:11 +0000 (07:52 +0200)] 
bug 1165: Changed text according to bug entry

6 years agoMerge branch 'bug-1112' into release
Michael Tänzer [Tue, 16 Apr 2013 20:41:26 +0000 (22:41 +0200)] 
Merge branch 'bug-1112' into release

6 years agoMerge branch 'bug-1099' into release
Michael Tänzer [Tue, 16 Apr 2013 16:36:49 +0000 (18:36 +0200)] 
Merge branch 'bug-1099' into release

6 years agobug 1154: typo and wording bug-1154
INOPIAE [Sat, 13 Apr 2013 13:12:43 +0000 (15:12 +0200)] 
bug 1154: typo and wording

6 years agobug 1154: small typo fix
INOPIAE [Tue, 9 Apr 2013 23:02:22 +0000 (01:02 +0200)] 
bug 1154: small typo fix

6 years agobug 1154: Changed URL
INOPIAE [Tue, 9 Apr 2013 22:56:42 +0000 (00:56 +0200)] 
bug 1154: Changed URL

6 years agobug 1154: added link
INOPIAE [Tue, 9 Apr 2013 22:34:55 +0000 (00:34 +0200)] 
bug 1154: added link

6 years agoBug-1154: Changed wording
INOPIAE [Tue, 9 Apr 2013 22:12:43 +0000 (00:12 +0200)] 
Bug-1154: Changed wording

6 years agobug 1159: Input validation for the time synchronsation on the signer bug-1159
Michael Tänzer [Tue, 9 Apr 2013 21:56:38 +0000 (23:56 +0200)] 
bug 1159: Input validation for the time synchronsation on the signer

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 740: Make link text translatable
Michael Tänzer [Fri, 29 Mar 2013 12:11:24 +0000 (13:11 +0100)] 
bug 740: Make link text translatable

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1099: Fix layout issue caused by edited CSS bug-1099
Michael Tänzer [Fri, 29 Mar 2013 12:02:36 +0000 (13:02 +0100)] 
bug 1099: Fix layout issue caused by edited CSS

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1099: Split long line
Michael Tänzer [Tue, 26 Mar 2013 22:58:19 +0000 (23:58 +0100)] 
bug 1099: Split long line

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1099: Edit the CSS style for unordered lists
Michael Tänzer [Tue, 26 Mar 2013 22:48:01 +0000 (23:48 +0100)] 
bug 1099: Edit the CSS style for unordered lists

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1099: Overhaul the root certificate download site
Michael Tänzer [Tue, 26 Mar 2013 22:17:42 +0000 (23:17 +0100)] 
bug 1099: Overhaul the root certificate download site

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 740: Make the link text translatable
Michael Tänzer [Tue, 19 Mar 2013 19:08:35 +0000 (20:08 +0100)] 
bug 740: Make the link text translatable

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1124: Avoid duplicate escaping and do ordering by locale bug-1124
Benny Baumann [Wed, 13 Mar 2013 17:38:52 +0000 (18:38 +0100)] 
bug 1124: Avoid duplicate escaping and do ordering by locale

6 years agobug 1124: Sanatize properly and make code look better
Benny Baumann [Wed, 13 Mar 2013 08:08:42 +0000 (09:08 +0100)] 
bug 1124: Sanatize properly and make code look better

6 years agobug 1124: Changed display to [locale] Language (country) eg[de-AT] German (Austria)
INOPIAE [Tue, 12 Mar 2013 22:29:32 +0000 (23:29 +0100)] 
bug 1124: Changed display to [locale] Language (country) eg[de-AT] German (Austria)

6 years agobug 740: Do some minor rewording to make the text more fluent.
Benny Baumann [Tue, 12 Mar 2013 21:59:15 +0000 (22:59 +0100)] 
bug 740: Do some minor rewording to make the text more fluent.

6 years agobug 740: removed https from hrefs to wiki
INOPIAE [Tue, 5 Mar 2013 22:36:50 +0000 (23:36 +0100)] 
bug 740: removed https from hrefs to wiki

6 years agoMerge branch 'tarballs' into release
Michael Tänzer [Tue, 5 Mar 2013 22:11:16 +0000 (23:11 +0100)] 
Merge branch 'tarballs' into release

6 years agoSource code taken from cacert-20130227.tar.bz2
Michael Tänzer [Tue, 5 Mar 2013 22:08:48 +0000 (23:08 +0100)] 
Source code taken from cacert-20130227.tar.bz2

6 years agoMerge branch 'bug-1141' into release
Michael Tänzer [Wed, 27 Feb 2013 00:46:14 +0000 (01:46 +0100)] 
Merge branch 'bug-1141' into release

6 years agoMerge remote-tracking branch 'origin/bug-1082' into release
Michael Tänzer [Wed, 27 Feb 2013 00:17:34 +0000 (01:17 +0100)] 
Merge remote-tracking branch 'origin/bug-1082' into release

6 years agoMerge branch 'bug-964' into release
Michael Tänzer [Wed, 27 Feb 2013 00:02:09 +0000 (01:02 +0100)] 
Merge branch 'bug-964' into release

6 years agobug 1112: Get TTP Assurances received, not given. bug-1112
Michael Tänzer [Tue, 26 Feb 2013 22:44:49 +0000 (23:44 +0100)] 
bug 1112: Get TTP Assurances received, not given.

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1112: Fix things popped up in review:
Michael Tänzer [Wed, 20 Feb 2013 14:52:30 +0000 (15:52 +0100)] 
bug 1112: Fix things popped up in review:

- whitespace/indentation
- require vs. include and possible issue with relative path
- wording
- intval($id)
- unnecessary change of language while the text is not sent through gettext
anyway
- do not use mysql_escape_string on email body
- make strings easier to translate

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 569: changed wording of output
INOPIAE [Wed, 20 Feb 2013 00:16:07 +0000 (01:16 +0100)] 
bug 569: changed wording of output

6 years agobug 569: small typo fix
INOPIAE [Tue, 19 Feb 2013 23:20:09 +0000 (00:20 +0100)] 
bug 569: small typo fix

6 years agoRevert "bug 964: Reduce variable scope where possible" bug-964
Benny Baumann [Tue, 19 Feb 2013 23:14:47 +0000 (00:14 +0100)] 
Revert "bug 964: Reduce variable scope where possible"

This reverts commit 387fde16ca52b6ccfc5a46be99219cd09a7411ce.
Decision based on discussion with Michael Tänzer.

6 years agobug 1124: Changed sorting order
INOPIAE [Tue, 19 Feb 2013 23:05:45 +0000 (00:05 +0100)] 
bug 1124: Changed sorting order

6 years agobug 964: Make the structure of some queries more easy to read
Benny Baumann [Tue, 19 Feb 2013 18:19:13 +0000 (19:19 +0100)] 
bug 964: Make the structure of some queries more easy to read

6 years agobug 964: Be a bit more paranoid here ...
Benny Baumann [Tue, 19 Feb 2013 17:29:21 +0000 (18:29 +0100)] 
bug 964: Be a bit more paranoid here ...

6 years agobug 964: Reduce variable scope where possible
Benny Baumann [Tue, 19 Feb 2013 17:25:51 +0000 (18:25 +0100)] 
bug 964: Reduce variable scope where possible

6 years agobug 964: Unbreak lines and do some proper indentation and spacing
Benny Baumann [Tue, 19 Feb 2013 17:24:34 +0000 (18:24 +0100)] 
bug 964: Unbreak lines and do some proper indentation and spacing

6 years agobug 964: Trailing whitespace cleanup
Benny Baumann [Tue, 19 Feb 2013 17:22:31 +0000 (18:22 +0100)] 
bug 964: Trailing whitespace cleanup

Also fixes one unnecessary BOM character in the keygen JS file

6 years agoMerge branch 'tarballs' into release
Michael Tänzer [Tue, 12 Feb 2013 23:05:03 +0000 (00:05 +0100)] 
Merge branch 'tarballs' into release

Conflicts:
scripts/db_migrations/version2.sh (file permissions)

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agoSource code taken from cacert-20130129.tar.bz2
Michael Tänzer [Tue, 12 Feb 2013 23:00:20 +0000 (00:00 +0100)] 
Source code taken from cacert-20130129.tar.bz2

6 years agobug 1099: Add Windows installer package to the website
Michael Tänzer [Tue, 12 Feb 2013 21:29:00 +0000 (22:29 +0100)] 
bug 1099: Add Windows installer package to the website

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1082: applied changes to box size bug-1082
INOPIAE [Sun, 27 Jan 2013 07:21:18 +0000 (08:21 +0100)] 
bug 1082: applied changes to box size

6 years agobug-1141: Show server certificates from deleted domains so a user can bug-1141
Michael Tänzer [Tue, 22 Jan 2013 23:24:14 +0000 (00:24 +0100)] 
bug-1141: Show server certificates from deleted domains so a user can
verify their state. Also: some cosmetic fixes

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 569: fixed fatal if clause
INOPIAE [Fri, 18 Jan 2013 23:04:20 +0000 (00:04 +0100)] 
bug 569: fixed fatal if clause

6 years agobug 569: changed the order of the lines according to the patch request
INOPIAE [Fri, 18 Jan 2013 22:00:02 +0000 (23:00 +0100)] 
bug 569: changed the order of the lines according to the patch request

6 years agobug 602: Doing it right(tm) bug-602
Benny Baumann [Thu, 17 Jan 2013 23:59:59 +0000 (00:59 +0100)] 
bug 602: Doing it right(tm)

6 years agoMerge branch 'bug-512' into release
Benny Baumann [Wed, 16 Jan 2013 04:03:11 +0000 (05:03 +0100)] 
Merge branch 'bug-512' into release

6 years agoMerge branch 'bug-795' into release
Benny Baumann [Wed, 16 Jan 2013 03:17:53 +0000 (04:17 +0100)] 
Merge branch 'bug-795' into release

6 years agoMerge branch 'bug-1133' into release
Benny Baumann [Wed, 16 Jan 2013 03:04:52 +0000 (04:04 +0100)] 
Merge branch 'bug-1133' into release

6 years agoMerge branch 'bug-1034' into release
Benny Baumann [Wed, 16 Jan 2013 02:38:31 +0000 (03:38 +0100)] 
Merge branch 'bug-1034' into release

6 years agoMerge branch 'bug-1097' into release
Benny Baumann [Wed, 16 Jan 2013 01:59:02 +0000 (02:59 +0100)] 
Merge branch 'bug-1097' into release

6 years agoMerge branch 'bug-1130' into release
Benny Baumann [Wed, 16 Jan 2013 00:46:18 +0000 (01:46 +0100)] 
Merge branch 'bug-1130' into release

6 years agoMerge branch 'bug-1009' into release
Benny Baumann [Wed, 16 Jan 2013 00:44:19 +0000 (01:44 +0100)] 
Merge branch 'bug-1009' into release

6 years agoMerge branch 'bug-1069' into release
Benny Baumann [Wed, 16 Jan 2013 00:23:32 +0000 (01:23 +0100)] 
Merge branch 'bug-1069' into release

6 years agoBug 602: Changes by uli
INOPIAE [Tue, 15 Jan 2013 23:43:37 +0000 (00:43 +0100)] 
Bug 602: Changes by uli

6 years agoMerge branch 'bug-888' into release
Benny Baumann [Tue, 15 Jan 2013 23:14:47 +0000 (00:14 +0100)] 
Merge branch 'bug-888' into release

6 years agoMerge branch 'bug-1118' into release
Benny Baumann [Tue, 15 Jan 2013 23:11:59 +0000 (00:11 +0100)] 
Merge branch 'bug-1118' into release

6 years agobug 1133: Changed order of the check if the account can be assured bug-1133
INOPIAE [Sat, 12 Jan 2013 21:45:44 +0000 (22:45 +0100)] 
bug 1133: Changed order of the check if the account can be assured

6 years agobug 1133: small adjustment in if statememnt
INOPIAE [Sat, 12 Jan 2013 19:36:39 +0000 (20:36 +0100)] 
bug 1133: small adjustment in if statememnt

6 years agobug 1130: Removed ' at end of first line bug-1130
INOPIAE [Tue, 8 Jan 2013 22:15:48 +0000 (23:15 +0100)] 
bug 1130: Removed ' at end of first line

6 years agobug 1133: Added function in line 150
INOPIAE [Tue, 8 Jan 2013 22:13:17 +0000 (23:13 +0100)] 
bug 1133: Added function in line 150

6 years agobug 1112: fixed typo
INOPIAE [Mon, 7 Jan 2013 19:02:02 +0000 (20:02 +0100)] 
bug 1112: fixed typo

6 years agobug 1009: adjusted links to images bug-1009
INOPIAE [Mon, 7 Jan 2013 18:08:44 +0000 (19:08 +0100)] 
bug 1009: adjusted links to images

6 years agobug 1130: adjusted link path to images
INOPIAE [Mon, 7 Jan 2013 18:00:25 +0000 (19:00 +0100)] 
bug 1130: adjusted link path to images

6 years agobug 1130: fixed xml-marker
INOPIAE [Mon, 7 Jan 2013 17:28:46 +0000 (18:28 +0100)] 
bug 1130: fixed xml-marker

6 years agobug 1009: Fixed xml-marker
INOPIAE [Mon, 7 Jan 2013 17:26:55 +0000 (18:26 +0100)] 
bug 1009: Fixed xml-marker

6 years agobug 512: Fix a problem causing blank result pages bug-512
Benny Baumann [Mon, 7 Jan 2013 17:08:56 +0000 (18:08 +0100)] 
bug 512: Fix a problem causing blank result pages

6 years agobug 1130: Exchanged www/policy/DisputeResolutionPolicy.php
INOPIAE [Sun, 6 Jan 2013 22:51:14 +0000 (23:51 +0100)] 
bug 1130: Exchanged www/policy/DisputeResolutionPolicy.php

6 years agobug 1009: Exchanged OAP
INOPIAE [Sun, 6 Jan 2013 22:45:14 +0000 (23:45 +0100)] 
bug 1009: Exchanged OAP

6 years agobug 1121: fixed file ending in includes/notary.inc.php
INOPIAE [Sun, 6 Jan 2013 22:11:54 +0000 (23:11 +0100)] 
bug 1121: fixed file ending in includes/notary.inc.php

6 years agobug 1121: Added backticks to sql-queries, small typo fix
INOPIAE [Sun, 6 Jan 2013 22:09:02 +0000 (23:09 +0100)] 
bug 1121: Added backticks to sql-queries, small typo fix

6 years agobug 740: Typo changes
INOPIAE [Sun, 6 Jan 2013 21:31:30 +0000 (22:31 +0100)] 
bug 740: Typo changes

6 years agobug 1112: small typo changes
INOPIAE [Sun, 6 Jan 2013 21:07:02 +0000 (22:07 +0100)] 
bug 1112: small typo changes

6 years agoTypos... bug-795
Bernhard Fröhlich [Thu, 3 Jan 2013 22:04:13 +0000 (23:04 +0100)] 
Typos...

6 years agobug 1112: small changes
INOPIAE [Wed, 19 Dec 2012 09:21:05 +0000 (10:21 +0100)] 
bug 1112: small changes

6 years agobug 1112: layout and typo fixes
INOPIAE [Wed, 19 Dec 2012 00:22:31 +0000 (01:22 +0100)] 
bug 1112: layout and typo fixes

6 years agobug 1112: changed include to ../ instead ../../
INOPIAE [Wed, 19 Dec 2012 00:10:15 +0000 (01:10 +0100)] 
bug 1112: changed include to ../ instead ../../

6 years agobug 1112: included reference to includes/wot.inc.php in pages/wot/4.php and added...
INOPIAE [Wed, 19 Dec 2012 00:01:44 +0000 (01:01 +0100)] 
bug 1112: included reference to includes/wot.inc.php in pages/wot/4.php and added 2nd filter on method in get_number_TTP

6 years agobug 1112: Changed $userid to $Session ...
INOPIAE [Tue, 18 Dec 2012 23:28:57 +0000 (00:28 +0100)] 
bug 1112: Changed $userid to $Session ...

6 years agobug 1112: Fix typo in string literal
Benny Baumann [Tue, 18 Dec 2012 23:11:42 +0000 (00:11 +0100)] 
bug 1112: Fix typo in string literal

7 years agobug 1112: Fix the nesting of the PHP markers
Benny Baumann [Sun, 16 Dec 2012 20:07:24 +0000 (21:07 +0100)] 
bug 1112: Fix the nesting of the PHP markers

7 years agoMerge branch 'bug-1112' by INOPIAE into bug-1112
Benny Baumann [Sun, 16 Dec 2012 19:59:43 +0000 (20:59 +0100)] 
Merge branch 'bug-1112' by INOPIAE into bug-1112

7 years agoMerge branch 'release' into bug-1112
Benny Baumann [Sun, 16 Dec 2012 19:13:43 +0000 (20:13 +0100)] 
Merge branch 'release' into bug-1112