cacert-devel.git
4 years agobug 1042: fix minor bad code, fix the missing table cell in the assurance view bug-1042
Felix Dörre [Tue, 9 Jun 2015 20:53:41 +0000 (22:53 +0200)] 
bug 1042: fix minor bad code, fix the missing table cell in the assurance view

4 years agobug 1042: show the new, correct points in SE-Console overview to stop confusing our...
Felix Dörre [Tue, 9 Jun 2015 20:35:06 +0000 (22:35 +0200)] 
bug 1042: show the new, correct points in SE-Console overview to stop confusing our supporters

4 years agobug 1042: fixup... int() is not a function
Felix Dörre [Sat, 6 Jun 2015 16:35:35 +0000 (18:35 +0200)] 
bug 1042: fixup... int() is not a function

4 years agobug 1042: remove an old points calculation from includes/lib/general.php
Felix Dörre [Sat, 6 Jun 2015 16:25:27 +0000 (18:25 +0200)] 
bug 1042: remove an old points calculation from includes/lib/general.php

4 years agobug 1042: fix get_received_total_points (in notary.inc.php) to better mimic intended...
Felix Dörre [Sat, 6 Jun 2015 13:49:49 +0000 (15:49 +0200)] 
bug 1042: fix get_received_total_points (in notary.inc.php) to better mimic intended behaviour

4 years agobug 1042: use the correct points function for sending assurance mails
Felix Dörre [Tue, 2 Jun 2015 20:20:40 +0000 (22:20 +0200)] 
bug 1042: use the correct points function for sending assurance mails

4 years agoMerge branch 'bug-1050' into bug-1042
Benny Baumann [Tue, 2 Jun 2015 20:01:28 +0000 (22:01 +0200)] 
Merge branch 'bug-1050' into bug-1042

4 years agoMerge branch 'bug-1316' into bug-1042
Benny Baumann [Tue, 2 Jun 2015 20:01:21 +0000 (22:01 +0200)] 
Merge branch 'bug-1316' into bug-1042

4 years agoMerge branch 'bug-1316' into bug-1050 bug-1050
Benny Baumann [Tue, 2 Jun 2015 20:01:07 +0000 (22:01 +0200)] 
Merge branch 'bug-1316' into bug-1050

4 years agobug 1316: refix the moved code (aargh, no scoping..) bug-1316
Felix Dörre [Tue, 2 Jun 2015 19:54:38 +0000 (21:54 +0200)] 
bug 1316: refix the moved code (aargh, no scoping..)

4 years agofix: the new notary.inc functions
Felix Dörre [Tue, 26 May 2015 20:29:13 +0000 (22:29 +0200)] 
fix: the new notary.inc functions

4 years agoMerge branch 'bug-1046' into bug-1042
Benny Baumann [Tue, 12 May 2015 21:50:16 +0000 (23:50 +0200)] 
Merge branch 'bug-1046' into bug-1042

4 years agobug 1046: ignoring deleted assurers in cron/updatesort.php bug-1046
Felix Dörre [Tue, 12 May 2015 21:38:54 +0000 (23:38 +0200)] 
bug 1046: ignoring deleted assurers in cron/updatesort.php

for displaying numbers wot.php?id=1 correctly

4 years agoMerge branch 'bug-1050' into bug-1042
Benny Baumann [Tue, 12 May 2015 21:21:25 +0000 (23:21 +0200)] 
Merge branch 'bug-1050' into bug-1042

4 years agoMerge branch 'bug-1316' into bug-1050
Benny Baumann [Tue, 12 May 2015 21:21:04 +0000 (23:21 +0200)] 
Merge branch 'bug-1316' into bug-1050

4 years agobug 1316: move update code to the front, that the new data is displayed immediately
Felix Dörre [Tue, 12 May 2015 21:16:36 +0000 (23:16 +0200)] 
bug 1316: move update code to the front, that the new data is displayed immediately

4 years agoMerge branch 'bug-1050' into bug-1042
Benny Baumann [Tue, 12 May 2015 20:50:10 +0000 (22:50 +0200)] 
Merge branch 'bug-1050' into bug-1042

4 years agobug 1050: use the new function to correct points after adding a new assurance.
Felix Dörre [Tue, 12 May 2015 20:32:42 +0000 (22:32 +0200)] 
bug 1050: use the new function to correct points after adding a new assurance.

4 years agoMerge branch 'bug-1316' into bug-1050
Felix Dörre [Tue, 12 May 2015 20:45:01 +0000 (22:45 +0200)] 
Merge branch 'bug-1316' into bug-1050

4 years agobug 1316: split the revoke_assurance-function to have a function to recalculate the...
Felix Dörre [Tue, 12 May 2015 20:29:51 +0000 (22:29 +0200)] 
bug 1316: split the revoke_assurance-function to have a function to recalculate the old points

4 years agobug 1050: fix using old variable names while assuring
Felix Dörre [Tue, 12 May 2015 19:53:38 +0000 (21:53 +0200)] 
bug 1050: fix using old variable names while assuring

4 years agoMerge branch 'bug-1058' into bug-1042
Benny Baumann [Tue, 5 May 2015 19:52:36 +0000 (21:52 +0200)] 
Merge branch 'bug-1058' into bug-1042

4 years agobug 1058: refixing big SQL query escaping with "'" in account/55 bug-1058
Felix Dörre [Tue, 5 May 2015 19:48:58 +0000 (21:48 +0200)] 
bug 1058: refixing big SQL query escaping with "'" in account/55

4 years agoMerge branches 'bug-1050', 'bug-1052', 'bug-1054', 'bug-1055', 'bug-1058', 'bug-1059...
Benny Baumann [Tue, 5 May 2015 18:38:04 +0000 (20:38 +0200)] 
Merge branches 'bug-1050', 'bug-1052', 'bug-1054', 'bug-1055', 'bug-1058', 'bug-1059' and 'bug-1060' into bug-1042

4 years agoMerge branch 'bug-1047' into bug-1042
Benny Baumann [Tue, 5 May 2015 18:37:06 +0000 (20:37 +0200)] 
Merge branch 'bug-1047' into bug-1042

4 years agoMerge branch 'bug-1047' into bug-1059 bug-1059
Felix Dörre [Tue, 5 May 2015 18:32:26 +0000 (20:32 +0200)] 
Merge branch 'bug-1047' into bug-1059

4 years agoMerge branch 'bug-1047' into bug-1060 bug-1060
Felix Dörre [Tue, 5 May 2015 18:32:26 +0000 (20:32 +0200)] 
Merge branch 'bug-1047' into bug-1060

4 years agoMerge branch 'bug-1047' into bug-1058
Felix Dörre [Tue, 5 May 2015 18:32:25 +0000 (20:32 +0200)] 
Merge branch 'bug-1047' into bug-1058

4 years agoMerge branch 'bug-1047' into bug-1054 bug-1054
Felix Dörre [Tue, 5 May 2015 18:32:24 +0000 (20:32 +0200)] 
Merge branch 'bug-1047' into bug-1054

4 years agoMerge branch 'bug-1047' into bug-1055 bug-1055
Felix Dörre [Tue, 5 May 2015 18:32:24 +0000 (20:32 +0200)] 
Merge branch 'bug-1047' into bug-1055

4 years agoMerge branch 'bug-1047' into bug-1050
Felix Dörre [Tue, 5 May 2015 18:32:23 +0000 (20:32 +0200)] 
Merge branch 'bug-1047' into bug-1050

4 years agoMerge branch 'bug-1047' into bug-1052 bug-1052
Felix Dörre [Tue, 5 May 2015 18:32:23 +0000 (20:32 +0200)] 
Merge branch 'bug-1047' into bug-1052

4 years agobug 1047: do not use undefined variable $log for calcing points bug-1047
Felix Dörre [Tue, 5 May 2015 18:25:22 +0000 (20:25 +0200)] 
bug 1047: do not use undefined variable $log for calcing points

4 years agoMerge branch 'bug-1054' into bug-1042
Benny Baumann [Tue, 5 May 2015 18:15:17 +0000 (20:15 +0200)] 
Merge branch 'bug-1054' into bug-1042

4 years agobug 1054: 'notary.inc.php' is now needed in general.php
Felix Dörre [Tue, 5 May 2015 18:12:50 +0000 (20:12 +0200)] 
bug 1054: 'notary.inc.php' is now needed in general.php

Because it re-calculates points.

4 years agoMerge branch 'bug-1046' into bug-1042
Benny Baumann [Tue, 5 May 2015 18:06:33 +0000 (20:06 +0200)] 
Merge branch 'bug-1046' into bug-1042

4 years agobug 1046: escape quotes in fix_assurer_flag-queries
Felix Dörre [Tue, 5 May 2015 18:02:19 +0000 (20:02 +0200)] 
bug 1046: escape quotes in fix_assurer_flag-queries

4 years agoMerge branch 'bug-1052' into bug-1042
Benny Baumann [Tue, 5 May 2015 17:51:20 +0000 (19:51 +0200)] 
Merge branch 'bug-1052' into bug-1042

4 years agobug 1052: refix if that got broken in last commit
Felix Dörre [Tue, 5 May 2015 17:39:22 +0000 (19:39 +0200)] 
bug 1052: refix if that got broken in last commit

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

4 years agobug 1062: the 'administrative increase'-check bug-1062
Felix Dörre [Wed, 29 Apr 2015 22:49:21 +0000 (00:49 +0200)] 
bug 1062: the 'administrative increase'-check

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

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

4 years agobug 1060: the 'administrative increase'-fix
Felix Dörre [Wed, 29 Apr 2015 22:46:35 +0000 (00:46 +0200)] 
bug 1060: the 'administrative increase'-fix

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-1060: new points calculation for pages/wot/1.php
Felix Dörre [Tue, 7 Apr 2015 20:47:19 +0000 (22:47 +0200)] 
bug-1060: new points calculation for pages/wot/1.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)

4 years agoUPD: new points calculation in CommModule/client.pl
Felix Dörre [Tue, 14 Apr 2015 19:35:22 +0000 (21:35 +0200)] 
UPD: new points calculation in CommModule/client.pl

4 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

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

4 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

4 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

4 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'

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

4 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

4 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

4 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

4 years agobug 1061: remove comments about the now non-existent file bug-1061
Benny Baumann [Wed, 21 Jan 2015 22:04:09 +0000 (23:04 +0100)] 
bug 1061: remove comments about the now non-existent file

4 years agobug-1061: Remove old/dead code so there is no need for a new point calculation.
Felix Dörre [Tue, 20 Jan 2015 21:02:21 +0000 (22:02 +0100)] 
bug-1061: Remove old/dead code so there is no need for a new point calculation.

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