cacert-devel.git
4 years agoMerge branch 'bug-775' into testserver-stable
Benny Baumann [Wed, 21 Jan 2015 21:49:27 +0000 (22:49 +0100)] 
Merge branch 'bug-775' into testserver-stable

4 years agobug 775: changed teh duration date for the organisation certificates to 2 years for...
INOPIAE [Tue, 25 Feb 2014 07:37:13 +0000 (08:37 +0100)] 
bug 775: changed teh duration date for the organisation certificates to 2 years for each type.

4 years agoMerge branch 'bug-1361' into testserver-stable
Benny Baumann [Wed, 21 Jan 2015 09:05:41 +0000 (10:05 +0100)] 
Merge branch 'bug-1361' into testserver-stable

4 years agoMerge branch 'bug-1317' into testserver-stable
Benny Baumann [Tue, 20 Jan 2015 23:30:24 +0000 (00:30 +0100)] 
Merge branch 'bug-1317' into testserver-stable

4 years agoMerge branch 'bug-1355' into testserver-stable
Benny Baumann [Tue, 20 Jan 2015 23:27:55 +0000 (00:27 +0100)] 
Merge branch 'bug-1355' into testserver-stable

4 years agoMerge branch 'bug-1129' into testserver-stable
Benny Baumann [Tue, 20 Jan 2015 23:14:12 +0000 (00:14 +0100)] 
Merge branch 'bug-1129' into testserver-stable

4 years agoFIX: Fixup: Better mailtext for support access.
Janis Streib [Tue, 20 Jan 2015 23:10:18 +0000 (00:10 +0100)] 
FIX: Fixup: Better mailtext for support access.

4 years agoMerge branch 'bug-1129' into testserver-stable
Benny Baumann [Tue, 20 Jan 2015 22:54:43 +0000 (23:54 +0100)] 
Merge branch 'bug-1129' into testserver-stable

4 years agoFIX: Better Mailtext for SE password lookup notification mail.
Janis Streib [Tue, 20 Jan 2015 22:11:19 +0000 (23:11 +0100)] 
FIX: Better Mailtext for SE password lookup notification mail.

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Tue, 20 Jan 2015 22:07:13 +0000 (23:07 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug-1354: fix the escaping function for gpg-key-comments bug-1354
Felix Dörre [Tue, 20 Jan 2015 21:58:17 +0000 (22:58 +0100)] 
bug-1354: fix the escaping function for gpg-key-comments

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Tue, 20 Jan 2015 21:35:35 +0000 (22:35 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Bruteforce UTF-8 out of the database
Benny Baumann [Tue, 20 Jan 2015 21:34:23 +0000 (22:34 +0100)] 
bug 1354: Bruteforce UTF-8 out of the database

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Tue, 20 Jan 2015 20:45:18 +0000 (21:45 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Fetch UTF8 names from database for gpg name checks.
Felix Dörre [Tue, 20 Jan 2015 20:27:55 +0000 (21:27 +0100)] 
bug 1354: Fetch UTF8 names from database for gpg name checks.

4 years agobug 1361: removed dead code from includes/account_stuff.php bug-1361
INOPIAE [Tue, 20 Jan 2015 20:27:20 +0000 (21:27 +0100)] 
bug 1361: removed dead code from includes/account_stuff.php

4 years agobug 1361: removed dead code from www/gpg.php
INOPIAE [Tue, 20 Jan 2015 20:24:48 +0000 (21:24 +0100)] 
bug 1361: removed dead code from www/gpg.php

4 years agoMerge branch 'bug-1360' into testserver-stable
Benny Baumann [Fri, 16 Jan 2015 17:54:46 +0000 (18:54 +0100)] 
Merge branch 'bug-1360' into testserver-stable

4 years agobug 1360: Minor whitespace cleanup bug-1360
Benny Baumann [Fri, 16 Jan 2015 17:53:59 +0000 (18:53 +0100)] 
bug 1360: Minor whitespace cleanup

4 years agobug 1360: Reorder code to have a single point to create a directory for storage as...
Benny Baumann [Fri, 16 Jan 2015 17:53:02 +0000 (18:53 +0100)] 
bug 1360: Reorder code to have a single point to create a directory for storage as needed

4 years agoMerge branch 'bug-1345' into release
Benny Baumann [Wed, 14 Jan 2015 16:43:10 +0000 (17:43 +0100)] 
Merge branch 'bug-1345' into release

4 years agobug-1317: FIX: Added + to GPG mail-check regexes bug-1317
Janis Streib [Wed, 14 Jan 2015 10:41:18 +0000 (11:41 +0100)] 
bug-1317: FIX: Added + to GPG mail-check regexes

4 years agoMerge branch 'bug-1355' into testserver-stable
Benny Baumann [Wed, 14 Jan 2015 00:20:06 +0000 (01:20 +0100)] 
Merge branch 'bug-1355' into testserver-stable

Conflicts:
includes/general.php
tverify/index.php

4 years agoMerge branch 'bug-1129' into testserver-stable
Benny Baumann [Wed, 14 Jan 2015 00:13:53 +0000 (01:13 +0100)] 
Merge branch 'bug-1129' into testserver-stable

Conflicts:
pages/account/13.php

4 years agoFROMAT: If-Block in 13.php (see bug #612)
Janis Streib [Tue, 13 Jan 2015 23:59:35 +0000 (00:59 +0100)] 
FROMAT: If-Block in 13.php (see bug #612)

4 years agobug-1129: added notification mail for insight to secret Q&A from SE
Janis Streib [Tue, 23 Dec 2014 22:33:01 +0000 (23:33 +0100)] 
bug-1129: added notification mail for insight to secret Q&A from SE
interface (see bug-612)

4 years agobug 1355: remove www/tverify bug-1355
Martin Gummi [Tue, 13 Jan 2015 23:48:47 +0000 (00:48 +0100)] 
bug 1355: remove www/tverify

4 years agobug-1355 enforced blocks for single statments
Martin Gummi [Tue, 13 Jan 2015 23:32:08 +0000 (00:32 +0100)] 
bug-1355 enforced blocks for single statments

4 years agobug-1355 add missing parenthesis
Martin Gummi [Tue, 13 Jan 2015 23:28:22 +0000 (00:28 +0100)] 
bug-1355 add missing parenthesis

4 years agobug 1355: remove file 51.php 52.php
Martin Gummi [Tue, 13 Jan 2015 22:16:35 +0000 (23:16 +0100)] 
bug 1355: remove file 51.php 52.php

4 years agobug 1355: remove tverify stuff of account.php
Martin Gummi [Tue, 13 Jan 2015 22:11:53 +0000 (23:11 +0100)] 
bug 1355: remove tverify stuff of account.php

4 years agoMerge branch 'bug-1357' into testserver-stable
Benny Baumann [Tue, 13 Jan 2015 22:04:03 +0000 (23:04 +0100)] 
Merge branch 'bug-1357' into testserver-stable

4 years agobug 1357: fixed query as the calcualtion was inconsitent
INOPIAE [Tue, 13 Jan 2015 22:01:54 +0000 (23:01 +0100)] 
bug 1357: fixed query as the calcualtion was inconsitent

4 years agobug 1355: remove commented tverify stuff 43.php
Martin Gummi [Tue, 13 Jan 2015 21:38:02 +0000 (22:38 +0100)] 
bug 1355: remove commented tverify stuff 43.php

4 years agobug 1357: fixed typo
INOPIAE [Tue, 13 Jan 2015 21:26:21 +0000 (22:26 +0100)] 
bug 1357: fixed typo

4 years agobug 1357: fixed typo
INOPIAE [Tue, 13 Jan 2015 21:21:08 +0000 (22:21 +0100)] 
bug 1357: fixed typo

4 years agoMerge branch 'bug-1357' into testserver-stable
Benny Baumann [Tue, 13 Jan 2015 20:55:30 +0000 (21:55 +0100)] 
Merge branch 'bug-1357' into testserver-stable

4 years agobug 1357: update of statistic output
INOPIAE [Tue, 13 Jan 2015 06:25:58 +0000 (07:25 +0100)] 
bug 1357: update of statistic output

4 years agobug 1357: replaced calculation assurer count with new function
INOPIAE [Tue, 13 Jan 2015 06:24:10 +0000 (07:24 +0100)] 
bug 1357: replaced calculation assurer count with new function

4 years agobug 1357: replaced calculation of monthly assurer count with new function
INOPIAE [Tue, 13 Jan 2015 06:20:30 +0000 (07:20 +0100)] 
bug 1357: replaced calculation of monthly assurer count with new function

4 years agobug 1357: replaced calculation of monthly assurer count with new function
INOPIAE [Tue, 13 Jan 2015 06:19:46 +0000 (07:19 +0100)] 
bug 1357: replaced calculation of monthly assurer count with new function

4 years agobug 1357: add new function assurer_count for statistical needs
INOPIAE [Tue, 13 Jan 2015 06:16:36 +0000 (07:16 +0100)] 
bug 1357: add new function assurer_count for statistical needs

4 years agobug 1355: remove tverify session from sample file
Martin Gummi [Thu, 8 Jan 2015 04:25:56 +0000 (05:25 +0100)] 
bug 1355: remove tverify session from sample file

4 years agobug 1355: remove comment tverify stuff
Martin Gummi [Thu, 8 Jan 2015 04:22:50 +0000 (05:22 +0100)] 
bug 1355: remove comment tverify stuff

4 years agobug 1355: remove tverfiy parts of general.php
Martin Gummi [Thu, 8 Jan 2015 04:17:41 +0000 (05:17 +0100)] 
bug 1355: remove tverfiy parts of general.php

4 years agobug 1355: remove file tverify_stuff.php
Martin Gummi [Tue, 6 Jan 2015 22:03:41 +0000 (23:03 +0100)] 
bug 1355: remove file tverify_stuff.php

4 years agobug 1355: remove include of tverify_stuff.php
Martin Gummi [Tue, 6 Jan 2015 21:57:59 +0000 (22:57 +0100)] 
bug 1355: remove include of tverify_stuff.php

4 years agobug 1155: remove tverify dir and files
Martin Gummi [Tue, 6 Jan 2015 21:50:21 +0000 (22:50 +0100)] 
bug 1155: remove tverify dir and files

4 years agoMerge branch 'bug-1043' into testserver-stable
Benny Baumann [Tue, 6 Jan 2015 21:26:12 +0000 (22:26 +0100)] 
Merge branch 'bug-1043' into testserver-stable

4 years agoMerge branch 'bug-1345' into testserver-stable
Benny Baumann [Tue, 6 Jan 2015 21:26:01 +0000 (22:26 +0100)] 
Merge branch 'bug-1345' into testserver-stable

4 years agobug 1345: Fix accidential omission bug-1345
Benny Baumann [Tue, 6 Jan 2015 21:25:46 +0000 (22:25 +0100)] 
bug 1345: Fix accidential omission

4 years agobug 1043: Remove obsolete Site Seal script pointing nowhere anyway bug-1043
Benny Baumann [Tue, 6 Jan 2015 21:23:10 +0000 (22:23 +0100)] 
bug 1043: Remove obsolete Site Seal script pointing nowhere anyway

4 years agobug 1043: Remove checks for the stamp.cacert.org host
Benny Baumann [Tue, 6 Jan 2015 21:22:29 +0000 (22:22 +0100)] 
bug 1043: Remove checks for the stamp.cacert.org host

4 years agobug 1043: Remove the stamp 'CAcert certified' code as this branch has been dead for...
Benny Baumann [Tue, 6 Jan 2015 21:07:36 +0000 (22:07 +0100)] 
bug 1043: Remove the stamp 'CAcert certified' code as this branch has been dead for ages already.

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Sat, 3 Jan 2015 15:15:50 +0000 (16:15 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Enforce proper escaping of special characters
Benny Baumann [Sat, 3 Jan 2015 15:15:27 +0000 (16:15 +0100)] 
bug 1354: Enforce proper escaping of special characters

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Sat, 3 Jan 2015 15:09:11 +0000 (16:09 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Fix UTF-8 decoding issue not generating proper HTML entities
Benny Baumann [Sat, 3 Jan 2015 15:08:44 +0000 (16:08 +0100)] 
bug 1354: Fix UTF-8 decoding issue not generating proper HTML entities

This is based on https://blog.benny-baumann.de/?p=332

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Sat, 3 Jan 2015 02:04:40 +0000 (03:04 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Avoid a warning with htmlentities not knowing the charset detected
Benny Baumann [Sat, 3 Jan 2015 02:04:01 +0000 (03:04 +0100)] 
bug 1354: Avoid a warning with htmlentities not knowing the charset detected

4 years agobug 1354: Avoid producing too many intermediate variants
Benny Baumann [Sat, 3 Jan 2015 01:59:47 +0000 (02:59 +0100)] 
bug 1354: Avoid producing too many intermediate variants

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Sat, 3 Jan 2015 01:47:12 +0000 (02:47 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Remove duplicates from the returned array
Benny Baumann [Sat, 3 Jan 2015 01:39:52 +0000 (02:39 +0100)] 
bug 1354: Remove duplicates from the returned array

4 years agobug 1354: Fix some typos in the translation table
Benny Baumann [Sat, 3 Jan 2015 01:39:22 +0000 (02:39 +0100)] 
bug 1354: Fix some typos in the translation table

4 years agobug 1354: Remove some characters which might cause unnecessary headaches
Benny Baumann [Sat, 3 Jan 2015 01:38:53 +0000 (02:38 +0100)] 
bug 1354: Remove some characters which might cause unnecessary headaches

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Fri, 2 Jan 2015 17:43:07 +0000 (18:43 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Implement generation of Name Variants based on simplification
Benny Baumann [Fri, 2 Jan 2015 17:41:46 +0000 (18:41 +0100)] 
bug 1354: Implement generation of Name Variants based on simplification

The simplification check looks for & s all encoded characters should have one.

4 years agobug 1354: Normalize encoding of names that are later on compared
Benny Baumann [Fri, 2 Jan 2015 17:39:56 +0000 (18:39 +0100)] 
bug 1354: Normalize encoding of names that are later on compared

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Fri, 2 Jan 2015 14:20:43 +0000 (15:20 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Avoid double-encoding of entities
Benny Baumann [Fri, 2 Jan 2015 14:20:31 +0000 (15:20 +0100)] 
bug 1354: Avoid double-encoding of entities

4 years agoMerge branch 'bug-1354' into testserver-stable
Benny Baumann [Fri, 2 Jan 2015 14:06:25 +0000 (15:06 +0100)] 
Merge branch 'bug-1354' into testserver-stable

4 years agobug 1354: Normalize names before comparison
Benny Baumann [Fri, 2 Jan 2015 14:05:55 +0000 (15:05 +0100)] 
bug 1354: Normalize names before comparison

4 years agoMerge branch 'bug-1345' into testserver-stable
Benny Baumann [Wed, 31 Dec 2014 15:49:05 +0000 (16:49 +0100)] 
Merge branch 'bug-1345' into testserver-stable

4 years agoMerge branch 'release' into testserver-stable
Benny Baumann [Wed, 31 Dec 2014 15:44:12 +0000 (16:44 +0100)] 
Merge branch 'release' into testserver-stable

4 years agobug 1345: Don't include things that aren't to be shown (and requested to be deleted...
Benny Baumann [Tue, 16 Dec 2014 21:19:53 +0000 (22:19 +0100)] 
bug 1345: Don't include things that aren't to be shown (and requested to be deleted self-referenced-ly) anyway

4 years agobug 1345: Requested typo correction
Eva Stöwe [Tue, 16 Dec 2014 21:18:11 +0000 (22:18 +0100)] 
bug 1345: Requested typo correction

4 years agobug 1345: Policy version of CCA document
Benedikt Heintel [Tue, 16 Dec 2014 21:13:54 +0000 (22:13 +0100)] 
bug 1345: Policy version of CCA document

4 years agoMerge branch 'bug-1131' into release
Benny Baumann [Tue, 16 Dec 2014 21:02:17 +0000 (22:02 +0100)] 
Merge branch 'bug-1131' into release

4 years agoMerge branch 'bug-1131' into testserver-stable
Benny Baumann [Tue, 16 Dec 2014 20:08:37 +0000 (21:08 +0100)] 
Merge branch 'bug-1131' into testserver-stable

4 years agoMerge branch 'release' into bug-1131 bug-1131
Benny Baumann [Tue, 16 Dec 2014 20:03:54 +0000 (21:03 +0100)] 
Merge branch 'release' into bug-1131

Conflicts:
pages/wot/6.php
www/policy/CAcertCommunityAgreement.php

The conflict in the CCA document page was introduced due to the rename of the file.
This instance can be safely ignored, as bug 1131 introduces a new version
superseeding the old document.

The instance in pages/wot/6.php is a bit more complicated, but basically
results from a change of bug 1137 and the modified paths to the policy documents.

4 years agoMerge branch 'bug-1343' into testserver-stable
Benny Baumann [Sat, 13 Dec 2014 19:33:18 +0000 (20:33 +0100)] 
Merge branch 'bug-1343' into testserver-stable

4 years agobug 1343: Properly terminate the CommModule when rquested bug-1343
Wytze van der Raay [Sat, 13 Dec 2014 19:31:16 +0000 (20:31 +0100)] 
bug 1343: Properly terminate the CommModule when rquested

4 years agoMerge remote-tracking branch 'origin/bug-790' into release
Michael Tänzer [Fri, 5 Dec 2014 00:26:02 +0000 (01:26 +0100)] 
Merge remote-tracking branch 'origin/bug-790' into release

4 years agoMerge remote-tracking branch 'origin/bug-1318' into release
Michael Tänzer [Fri, 5 Dec 2014 00:11:53 +0000 (01:11 +0100)] 
Merge remote-tracking branch 'origin/bug-1318' into release

4 years agoMerge remote-tracking branch 'origin/bug-1288' into release
Michael Tänzer [Thu, 4 Dec 2014 21:50:46 +0000 (22:50 +0100)] 
Merge remote-tracking branch 'origin/bug-1288' into release

4 years agoMerge branch 'tarballs' into release
Michael Tänzer [Thu, 4 Dec 2014 18:08:25 +0000 (19:08 +0100)] 
Merge branch 'tarballs' into release

Conflicts:
scripts/send_policy_cca_20140916.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
4 years agoSource code taken from cacert-20141124.tar.bz2
Michael Tänzer [Thu, 4 Dec 2014 17:26:23 +0000 (18:26 +0100)] 
Source code taken from cacert-20141124.tar.bz2

4 years agoMerge branch 'bug-1302' into testserver-stable
Benny Baumann [Tue, 2 Dec 2014 22:45:22 +0000 (23:45 +0100)] 
Merge branch 'bug-1302' into testserver-stable

4 years agobug-1302: double link removed bug-1302
Martin Gummi [Tue, 2 Dec 2014 22:42:24 +0000 (23:42 +0100)] 
bug-1302: double link removed

4 years agoMerge branch 'bug-1282' into testserver-stable
Benny Baumann [Tue, 2 Dec 2014 22:37:46 +0000 (23:37 +0100)] 
Merge branch 'bug-1282' into testserver-stable

4 years agoMerge branch 'bug-1302' into testserver-stable
Benny Baumann [Tue, 2 Dec 2014 22:34:46 +0000 (23:34 +0100)] 
Merge branch 'bug-1302' into testserver-stable

4 years agobug-1282: fix some creepy whitespace things bug-1282
Felix Dörre [Tue, 2 Dec 2014 22:34:31 +0000 (23:34 +0100)] 
bug-1282: fix some creepy whitespace things

4 years agobug-1282: (related) fix the redirection-feature for domain search
Felix Dörre [Tue, 2 Dec 2014 22:31:22 +0000 (23:31 +0100)] 
bug-1282: (related) fix the redirection-feature for domain search

4 years agobug-1302: change text 40.php
Martin Gummi [Tue, 2 Dec 2014 22:11:33 +0000 (23:11 +0100)] 
bug-1302: change text 40.php

4 years agoMerge branch 'bug-1282' into testserver-stable
Benny Baumann [Tue, 2 Dec 2014 21:54:19 +0000 (22:54 +0100)] 
Merge branch 'bug-1282' into testserver-stable

4 years agobug 1282: added comment for search about id in search page account/48.php
Benny Baumann [Tue, 2 Dec 2014 21:40:37 +0000 (22:40 +0100)] 
bug 1282: added comment for search about id in search page account/48.php

4 years agobug 1282: changed the check routine for ID
INOPIAE [Wed, 11 Jun 2014 06:19:05 +0000 (08:19 +0200)] 
bug 1282: changed the check routine for ID

4 years agobug-1302: uppercase to lowercase 40.php
Martin Gummi [Tue, 2 Dec 2014 21:31:18 +0000 (22:31 +0100)] 
bug-1302: uppercase to lowercase 40.php

4 years agobug-1302: modify link to wiki -> LostPasswordOrAccount
Martin Gummi [Tue, 25 Nov 2014 21:56:20 +0000 (22:56 +0100)] 
bug-1302: modify link to wiki -> LostPasswordOrAccount

4 years agobug-1302: change descriptions text
Martin Gummi [Tue, 25 Nov 2014 22:05:48 +0000 (23:05 +0100)] 
bug-1302: change descriptions text