AgeCommit message (Collapse)Author
2015-06-02Merge branch 'bug-1316' into bug-1050bug-1050Benny Baumann
2015-06-02bug 1316: refix the moved code (aargh, no scoping..)bug-1316Felix Dörre
2015-05-12Merge branch 'bug-1316' into bug-1050Benny Baumann
2015-05-12bug 1316: move update code to the front, that the new data is displayed ↵Felix Dörre
2015-05-12bug 1050: use the new function to correct points after adding a new assurance.Felix Dörre
2015-05-12Merge branch 'bug-1316' into bug-1050Felix Dörre
2015-05-12bug 1316: split the revoke_assurance-function to have a function to ↵Felix Dörre
recalculate the old points
2015-05-12bug 1050: fix using old variable names while assuringFelix Dörre
2015-05-05Merge branch 'bug-1047' into bug-1050Felix Dörre
2015-05-05bug 1047: do not use undefined variable $log for calcing pointsbug-1047Felix Dörre
2015-04-28upd: change condition for when a user is allowed to be emailed to what ↵Felix Dörre
seemed to be intended
2015-04-28bug 1050: refix removal of $newpointsFelix Dörre
2015-04-28bug 1050: expunge the old, rounded points from www/wot.phpFelix Dörre
2015-04-21bug 1050: repatch www/wot.php to use functions from 1047Felix Dörre
2015-04-21Merge branch 'bug-1047' into bug-1050Felix Dörre
2015-04-21bug 1047: refix www/index.phpFelix Dörre
2015-04-21bug 1047: Add notary function for all total pointsFelix Dörre
2015-04-21bug 1047: removing old points calculation from www/index.php and using the ↵Felix Dörre
notary functions now
2015-03-11Merge branch 'bug-1341' into releaseBenny Baumann
2015-03-11bug 1341: Avoid a privacy issue leaking information if an account exists.bug-1341Benny Baumann
2015-03-11Merge branch 'bug-1341' into releaseBenny Baumann
2015-02-25bug-1050: fix queries to calculate points according to 'new calculation'Felix Dörre
2015-02-13Merge branch 'bug-773' into releaseBenny Baumann
2015-02-13Merge branch 'bug-597' into releaseBenny Baumann
2015-01-14Merge branch 'bug-1345' into releaseBenny Baumann
2015-01-06bug 1345: Fix accidential omissionbug-1345Benny Baumann
2014-12-16bug 1345: Don't include things that aren't to be shown (and requested to be ↵Benny Baumann
deleted self-referenced-ly) anyway
2014-12-16bug 1345: Requested typo correctionEva Stöwe
2014-12-16bug 1345: Policy version of CCA documentBenedikt Heintel
2014-12-16Merge branch 'bug-1131' into releaseBenny Baumann
2014-12-16Merge branch 'release' into bug-1131bug-1131Benny Baumann
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.
2014-12-05Merge remote-tracking branch 'origin/bug-790' into releaseMichael Tänzer
2014-12-05Merge remote-tracking branch 'origin/bug-1318' into releaseMichael Tänzer
2014-12-04Merge remote-tracking branch 'origin/bug-1288' into releaseMichael Tänzer
2014-12-04Merge branch 'tarballs' into releaseMichael Tänzer
Conflicts: scripts/send_policy_cca_20140916.php Signed-off-by: Michael Tänzer <>
2014-12-04Source code taken from cacert-20141124.tar.bz2Michael Tänzer
2014-12-03bug-1341: Restrict to 1 login per 5 secondsBenny Baumann
2014-12-03bug-1341: add the db_migration script for the new columnFelix Dörre
2014-11-30bug 1318: Minor typobug-1318Benny Baumann
2014-11-30bug 1318: Variable name typoBenny Baumann
2014-11-30bug 1288: Some cleanup as this is never used anywaybug-1288Benny Baumann
2014-11-30bug 1288: Accept STARTTLS as last optionBenny Baumann
2014-11-29bug 1318: typo in variable namesBenny Baumann
2014-11-29bug 1318: Actually sort by priorityBenny Baumann
2014-11-29bug 1318: Fix a check for if there were any serversBenny Baumann
2014-11-29bug 1318: Request the array containing the priorities to sort entries propoerlyBenny Baumann
2014-11-29bug 1288: Actually request encryption for the connection before activatingBenny Baumann
2014-11-29bug 1288: EHLO returns 250 on successBenny Baumann
2014-11-29bug 1318: Typo in control structureBenny Baumann
2014-11-29bug 1288: Do STARTTLS whenever offered by the serverBenny Baumann