cacert-devel.git
4 years agoMerge branch 'bug-1059' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 22:26:58 +0000 (00:26 +0200)] 
Merge branch 'bug-1059' into bug-1042

4 years agoMerge branch 'bug-1058' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 22:25:31 +0000 (00:25 +0200)] 
Merge branch 'bug-1058' into bug-1042

4 years agobug-1058: fix points calculation in pages/account/55.php
Felix Dörre [Tue, 7 Apr 2015 20:32:43 +0000 (22:32 +0200)] 
bug-1058: fix points calculation in pages/account/55.php

4 years agoMerge branch 'bug-1055' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 22:21:27 +0000 (00:21 +0200)] 
Merge branch 'bug-1055' into bug-1042

4 years agoMerge branch 'bug-1054' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 22:18:16 +0000 (00:18 +0200)] 
Merge branch 'bug-1054' into bug-1042

4 years agobug-1054: new points calculation for includes/general.php
Felix Dörre [Tue, 7 Apr 2015 20:04:55 +0000 (22:04 +0200)] 
bug-1054: new points calculation for includes/general.php

4 years agoMerge branch 'bug-1053' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 18:43:16 +0000 (20:43 +0200)] 
Merge branch 'bug-1053' into bug-1042

4 years agoMerge branch 'bug-1052' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 18:42:46 +0000 (20:42 +0200)] 
Merge branch 'bug-1052' into bug-1042

4 years agobug-1055: fix points calculation in includes/lib/account.php
Felix Dörre [Tue, 7 Apr 2015 20:12:23 +0000 (22:12 +0200)] 
bug-1055: fix points calculation in includes/lib/account.php

4 years agobug-1059: new points calculation in pages/wot/9.php
Felix Dörre [Tue, 7 Apr 2015 20:41:19 +0000 (22:41 +0200)] 
bug-1059: new points calculation in pages/wot/9.php

4 years agobug-1053: new points calculation in includes/account.php bug-1053
Felix Dörre [Tue, 7 Apr 2015 19:17:19 +0000 (21:17 +0200)] 
bug-1053: new points calculation in includes/account.php

4 years agobug-1052: new points calc for includes/loggedin.php
Felix Dörre [Tue, 7 Apr 2015 19:13:25 +0000 (21:13 +0200)] 
bug-1052: new points calc for includes/loggedin.php

4 years agoMerge branch 'bug-1051' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 13:10:08 +0000 (15:10 +0200)] 
Merge branch 'bug-1051' into bug-1042

4 years agoMerge branch 'bug-1050' into bug-1042
Benny Baumann [Wed, 29 Apr 2015 13:09:08 +0000 (15:09 +0200)] 
Merge branch 'bug-1050' into bug-1042

4 years agoupd: change condition for when a user is allowed to be emailed to what seemed to...
Felix Dörre [Wed, 22 Apr 2015 20:39:39 +0000 (22:39 +0200)] 
upd: change condition for when a user is allowed to be emailed to what seemed to be intended

4 years agobug 1050: refix removal of $newpoints
Felix Dörre [Wed, 22 Apr 2015 20:01:15 +0000 (22:01 +0200)] 
bug 1050: refix removal of $newpoints

4 years agobug 1050: expunge the old, rounded points from www/wot.php
Felix Dörre [Tue, 21 Apr 2015 20:45:31 +0000 (22:45 +0200)] 
bug 1050: expunge the old, rounded points from www/wot.php

4 years agobug 1050: repatch www/wot.php to use functions from 1047
Felix Dörre [Tue, 21 Apr 2015 20:12:56 +0000 (22:12 +0200)] 
bug 1050: repatch www/wot.php to use functions from 1047

4 years agoMerge branch 'bug-1047' into bug-1050
Felix Dörre [Tue, 21 Apr 2015 20:10:45 +0000 (22:10 +0200)] 
Merge branch 'bug-1047' into bug-1050

4 years agoMerge branch 'bug-1049' into bug-1042
Benny Baumann [Tue, 21 Apr 2015 19:41:00 +0000 (21:41 +0200)] 
Merge branch 'bug-1049' into bug-1042

4 years agoMerge branch 'bug-1048' into bug-1042
Benny Baumann [Tue, 21 Apr 2015 19:40:48 +0000 (21:40 +0200)] 
Merge branch 'bug-1048' into bug-1042

4 years agoMerge branch 'bug-1047' into bug-1042
Benny Baumann [Tue, 21 Apr 2015 19:40:31 +0000 (21:40 +0200)] 
Merge branch 'bug-1047' into bug-1042

4 years agobug 1047: refix www/index.php
Felix Dörre [Tue, 7 Apr 2015 19:51:48 +0000 (21:51 +0200)] 
bug 1047: refix www/index.php

4 years agobug 1047: Add notary function for all total points
Felix Dörre [Tue, 7 Apr 2015 19:48:20 +0000 (21:48 +0200)] 
bug 1047: Add notary function for all total points

4 years agobug 1047: removing old points calculation from www/index.php and using the notary...
Felix Dörre [Wed, 1 Apr 2015 23:49:37 +0000 (01:49 +0200)] 
bug 1047: removing old points calculation from www/index.php and using the notary functions now

4 years agoMerge branch 'bug-1046' into bug-1042
Benny Baumann [Tue, 21 Apr 2015 19:17:30 +0000 (21:17 +0200)] 
Merge branch 'bug-1046' into bug-1042

4 years agoUPD: fixup for 'administrativ-increase-assurances' in refresh_stats.php bug-1051
Felix Dörre [Sun, 19 Apr 2015 13:07:06 +0000 (15:07 +0200)] 
UPD: fixup for 'administrativ-increase-assurances' in refresh_stats.php

4 years agoupd: fixup for includes/lib/account for administrative-increase-assurances
Felix Dörre [Sun, 19 Apr 2015 13:09:45 +0000 (15:09 +0200)] 
upd: fixup for includes/lib/account for administrative-increase-assurances

4 years agoMerge branch 'bug-1043' into bug-1042
Benny Baumann [Sun, 19 Apr 2015 10:23:23 +0000 (12:23 +0200)] 
Merge branch 'bug-1043' into bug-1042

4 years agobug-1046: new points calculation in updatesort.php (code moved to includes/lib/accoun...
Felix Dörre [Tue, 14 Apr 2015 20:28:02 +0000 (22:28 +0200)] 
bug-1046: new points calculation in updatesort.php (code moved to includes/lib/account.php)

5 years agoMerge branch 'bug-1341' into release
Benny Baumann [Wed, 11 Mar 2015 22:31:09 +0000 (23:31 +0100)] 
Merge branch 'bug-1341' into release

5 years agobug 1341: Avoid a privacy issue leaking information if an account exists. bug-1341
Benny Baumann [Wed, 11 Mar 2015 22:28:11 +0000 (23:28 +0100)] 
bug 1341: Avoid a privacy issue leaking information if an account exists.

5 years agoMerge branch 'bug-1341' into release
Benny Baumann [Wed, 11 Mar 2015 20:11:41 +0000 (21:11 +0100)] 
Merge branch 'bug-1341' into release

5 years agobug-1051: Update some SQL queries in stats to new points calculation
Felix Dörre [Tue, 24 Feb 2015 22:53:53 +0000 (23:53 +0100)] 
bug-1051: Update some SQL queries in stats to new points calculation

5 years agobug-1050: fix queries to calculate points according to 'new calculation'
Felix Dörre [Tue, 24 Feb 2015 22:47:20 +0000 (23:47 +0100)] 
bug-1050: fix queries to calculate points according to 'new calculation'

5 years agobug-1049: remove api/cemails.php as it is old and unused. bug-1049
Felix Dörre [Tue, 24 Feb 2015 22:11:01 +0000 (23:11 +0100)] 
bug-1049: remove api/cemails.php as it is old and unused.

5 years agobug-1048: removing api/ccsr.php because it's unused bug-1048
Felix Dörre [Tue, 24 Feb 2015 21:49:26 +0000 (22:49 +0100)] 
bug-1048: removing api/ccsr.php because it's unused

5 years agoMerge branch 'bug-773' into release
Benny Baumann [Fri, 13 Feb 2015 08:04:13 +0000 (09:04 +0100)] 
Merge branch 'bug-773' into release

5 years agoMerge branch 'bug-597' into release
Benny Baumann [Fri, 13 Feb 2015 08:01:41 +0000 (09:01 +0100)] 
Merge branch 'bug-597' into release

5 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

5 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

5 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

5 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

5 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.

5 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

5 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

5 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

5 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

5 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.

5 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

5 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

5 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

5 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>
5 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

5 years agobug-1341: Restrict to 1 login per 5 seconds
Benny Baumann [Tue, 2 Dec 2014 23:37:54 +0000 (00:37 +0100)] 
bug-1341: Restrict to 1 login per 5 seconds

5 years agobug-1341: add the db_migration script for the new column
Felix Dörre [Sun, 23 Nov 2014 00:52:27 +0000 (01:52 +0100)] 
bug-1341: add the db_migration script for the new column

5 years agobug 1318: Minor typo bug-1318
Benny Baumann [Sun, 30 Nov 2014 18:03:44 +0000 (19:03 +0100)] 
bug 1318: Minor typo

5 years agobug 1318: Variable name typo
Benny Baumann [Sun, 30 Nov 2014 17:57:09 +0000 (18:57 +0100)] 
bug 1318: Variable name typo

5 years agobug 1288: Some cleanup as this is never used anyway bug-1288
Benny Baumann [Sun, 30 Nov 2014 17:42:09 +0000 (18:42 +0100)] 
bug 1288: Some cleanup as this is never used anyway

5 years agobug 1288: Accept STARTTLS as last option
Benny Baumann [Sun, 30 Nov 2014 00:31:25 +0000 (01:31 +0100)] 
bug 1288: Accept STARTTLS as last option

5 years agobug 1318: typo in variable names
Benny Baumann [Sat, 29 Nov 2014 14:11:15 +0000 (15:11 +0100)] 
bug 1318: typo in variable names

5 years agobug 1318: Actually sort by priority
Benny Baumann [Sat, 29 Nov 2014 14:08:09 +0000 (15:08 +0100)] 
bug 1318: Actually sort by priority

5 years agobug 1318: Fix a check for if there were any servers
Benny Baumann [Sat, 29 Nov 2014 13:58:20 +0000 (14:58 +0100)] 
bug 1318: Fix a check for if there were any servers

5 years agobug 1318: Request the array containing the priorities to sort entries propoerly
Benny Baumann [Sat, 29 Nov 2014 13:50:31 +0000 (14:50 +0100)] 
bug 1318: Request the array containing the priorities to sort entries propoerly

5 years agobug 1288: Actually request encryption for the connection before activating
Benny Baumann [Sat, 29 Nov 2014 13:44:09 +0000 (14:44 +0100)] 
bug 1288: Actually request encryption for the connection before activating

5 years agobug 1288: EHLO returns 250 on success
Benny Baumann [Sat, 29 Nov 2014 13:33:18 +0000 (14:33 +0100)] 
bug 1288: EHLO returns 250 on success

5 years agobug 1318: Typo in control structure
Benny Baumann [Sat, 29 Nov 2014 13:26:16 +0000 (14:26 +0100)] 
bug 1318: Typo in control structure

5 years agobug 1288: Do STARTTLS whenever offered by the server
Benny Baumann [Sat, 29 Nov 2014 12:48:19 +0000 (13:48 +0100)] 
bug 1288: Do STARTTLS whenever offered by the server

5 years agobug 1318: Properly order MX records by order given in RFC 5321
Benny Baumann [Sat, 29 Nov 2014 12:46:50 +0000 (13:46 +0100)] 
bug 1318: Properly order MX records by order given in RFC 5321

5 years agoMerge branch 'bug-28' into release
Benny Baumann [Sun, 23 Nov 2014 14:21:16 +0000 (15:21 +0100)] 
Merge branch 'bug-28' into release

Conflicts:
includes/account.php
scripts/cron/warning.php
www/disputes.php
www/wot.php

5 years agoMerge branch 'bug-1273' into release
Benny Baumann [Sun, 23 Nov 2014 14:02:56 +0000 (15:02 +0100)] 
Merge branch 'bug-1273' into release

5 years agoMerge branch 'bug-1192' into release
Benny Baumann [Sun, 23 Nov 2014 14:02:16 +0000 (15:02 +0100)] 
Merge branch 'bug-1192' into release

5 years agoMerge branch 'bug-1339' into release
Benny Baumann [Tue, 18 Nov 2014 18:36:13 +0000 (19:36 +0100)] 
Merge branch 'bug-1339' into release

5 years agobug-1339: remove all traces of OTP bug-1339
Felix Dörre [Sat, 15 Nov 2014 11:12:12 +0000 (12:12 +0100)] 
bug-1339: remove all traces of OTP

5 years agobug-1273: fixing backticks in 'warning'-cron-script bug-1273
Felix Dörre [Tue, 21 Oct 2014 20:38:35 +0000 (22:38 +0200)] 
bug-1273: fixing backticks in 'warning'-cron-script

5 years agoMerge remote-tracking branch 'origin/bug-1301' into release
Michael Tänzer [Thu, 16 Oct 2014 19:00:38 +0000 (21:00 +0200)] 
Merge remote-tracking branch 'origin/bug-1301' into release

5 years agobug-1192: changed text on index/52.php bug-1192
INOPIAE [Tue, 14 Oct 2014 19:59:57 +0000 (21:59 +0200)] 
bug-1192: changed text on index/52.php

5 years agobug-790: update the text for orgClientCert bug-790
Felix Dörre [Tue, 7 Oct 2014 21:13:06 +0000 (23:13 +0200)] 
bug-790: update the text for orgClientCert

According to common decision in SAP meeting.

5 years agobug-790: Add a descriptive text for orgClient ...
Felix Dörre [Tue, 7 Oct 2014 20:17:57 +0000 (22:17 +0200)] 
bug-790: Add a descriptive text for orgClient ...

... to help people to see where the CSR should go.

5 years agobug-790: change PEM-Armor-striping code to not break correct CSRs
Felix Dörre [Tue, 23 Sep 2014 22:20:37 +0000 (00:20 +0200)] 
bug-790: change PEM-Armor-striping code to not break correct CSRs

(copied from somewhere above)

5 years agobug-1192: added explanation text
INOPIAE [Tue, 30 Sep 2014 20:00:07 +0000 (22:00 +0200)] 
bug-1192: added explanation text

5 years agoCCA-Mailing: bugfix for script continuation problem reported by Wytze
Benny Baumann [Wed, 24 Sep 2014 19:43:32 +0000 (21:43 +0200)] 
CCA-Mailing: bugfix for script continuation problem reported by Wytze

5 years agobug-709: change spkac-text, wrap crt with <pre>s
Felix Dörre [Tue, 23 Sep 2014 21:56:57 +0000 (23:56 +0200)] 
bug-709: change spkac-text, wrap crt with <pre>s

5 years agobug 1131: Update to CPS by Policy Officer
Benny Baumann [Tue, 23 Sep 2014 21:51:03 +0000 (23:51 +0200)] 
bug 1131: Update to CPS by Policy Officer

5 years agobug-790: do translation, fix cert download
Felix Dörre [Tue, 23 Sep 2014 21:39:11 +0000 (23:39 +0200)] 
bug-790: do translation, fix cert download

5 years agobug 1131: Updated TTP-Policies by Policy Officer
Benny Baumann [Tue, 23 Sep 2014 21:38:07 +0000 (23:38 +0200)] 
bug 1131: Updated TTP-Policies by Policy Officer

5 years agobug 1131: Minor link fix by Eva Stöwe/Policy Officer
Benny Baumann [Tue, 23 Sep 2014 21:30:52 +0000 (23:30 +0200)] 
bug 1131: Minor link fix by Eva Stöwe/Policy Officer

5 years agobug 1131: And yet some more updates by the Policy Officer
Benny Baumann [Tue, 23 Sep 2014 21:24:35 +0000 (23:24 +0200)] 
bug 1131: And yet some more updates by the Policy Officer

5 years agobug 1131: Yet some more updates by the Policy Officer
Benny Baumann [Tue, 23 Sep 2014 21:16:56 +0000 (23:16 +0200)] 
bug 1131: Yet some more updates by the Policy Officer

5 years agobug-790: implement that thing.
Felix Dörre [Tue, 23 Sep 2014 21:12:24 +0000 (23:12 +0200)] 
bug-790: implement that thing.

5 years agobug 1131: More policies updated by Policy Officer
Benny Baumann [Tue, 23 Sep 2014 21:01:19 +0000 (23:01 +0200)] 
bug 1131: More policies updated by Policy Officer

5 years agobug 1131: Updated SecurityPolicy.html by Eva Stöwe/Policy Officer
Benny Baumann [Tue, 23 Sep 2014 20:21:31 +0000 (22:21 +0200)] 
bug 1131: Updated SecurityPolicy.html by Eva Stöwe/Policy Officer

5 years agobug 1131: Added new version of CPS
Benny Baumann [Wed, 17 Sep 2014 06:57:27 +0000 (08:57 +0200)] 
bug 1131: Added new version of CPS

5 years agobug 1131: Updated alt text for the document status images
Benny Baumann [Tue, 16 Sep 2014 21:39:25 +0000 (23:39 +0200)] 
bug 1131: Updated alt text for the document status images

5 years agobug 1131: Updated Policies based on new versions send by Policy Officer
Benny Baumann [Tue, 16 Sep 2014 20:16:39 +0000 (22:16 +0200)] 
bug 1131: Updated Policies based on new versions send by Policy Officer

Additionally trailing whitespaces, indentation and line breaks have been
partially edited to ease reading of the HTML code.

The CCA has been skipped to avoid race conditions with other currently
running processes.

5 years agoadd: Policy Mailing script for notification about the new CCA as of 2014-07-20.
Benny Baumann [Tue, 16 Sep 2014 07:31:53 +0000 (09:31 +0200)] 
add: Policy Mailing script for notification about the new CCA as of 2014-07-20.

5 years agobug 1301: Fix issue with missing default for the encoding bug-1301
Benny Baumann [Fri, 29 Aug 2014 22:53:41 +0000 (00:53 +0200)] 
bug 1301: Fix issue with missing default for the encoding

5 years agoMerge branch 'bug-1293' into release
Benny Baumann [Thu, 28 Aug 2014 07:22:31 +0000 (09:22 +0200)] 
Merge branch 'bug-1293' into release

5 years agoMerge branch 'bug-1297' into release
Benny Baumann [Wed, 20 Aug 2014 20:34:25 +0000 (22:34 +0200)] 
Merge branch 'bug-1297' into release

5 years agoMerge branch 'bug-1298' into release
Benny Baumann [Wed, 20 Aug 2014 20:34:10 +0000 (22:34 +0200)] 
Merge branch 'bug-1298' into release