summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-30Merge branch 'bug-1059' into bug-1042Benny Baumann
2015-04-30Merge branch 'bug-1058' into bug-1042Benny Baumann
2015-04-30bug-1058: fix points calculation in pages/account/55.phpFelix Dörre
2015-04-30Merge branch 'bug-1055' into bug-1042Benny Baumann
2015-04-30Merge branch 'bug-1054' into bug-1042Benny Baumann
2015-04-30bug-1054: new points calculation for includes/general.phpFelix Dörre
2015-04-29Merge branch 'bug-1053' into bug-1042Benny Baumann
2015-04-29Merge branch 'bug-1052' into bug-1042Benny Baumann
2015-04-29bug-1055: fix points calculation in includes/lib/account.phpFelix Dörre
2015-04-29bug-1059: new points calculation in pages/wot/9.phpFelix Dörre
2015-04-29bug-1053: new points calculation in includes/account.phpbug-1053Felix Dörre
2015-04-29bug-1052: new points calc for includes/loggedin.phpFelix Dörre
2015-04-29Merge branch 'bug-1051' into bug-1042Benny Baumann
2015-04-29Merge branch 'bug-1050' into bug-1042Benny Baumann
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-21Merge branch 'bug-1049' into bug-1042Benny Baumann
2015-04-21Merge branch 'bug-1048' into bug-1042Benny Baumann
2015-04-21Merge branch 'bug-1047' into bug-1042Benny Baumann
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-04-21Merge branch 'bug-1046' into bug-1042Benny Baumann
2015-04-21UPD: fixup for 'administrativ-increase-assurances' in refresh_stats.phpbug-1051Felix Dörre
2015-04-21upd: fixup for includes/lib/account for administrative-increase-assurancesFelix Dörre
2015-04-19Merge branch 'bug-1043' into bug-1042Benny Baumann
2015-04-14bug-1046: new points calculation in updatesort.php (code moved to ↵Felix Dörre
includes/lib/account.php)
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-1051: Update some SQL queries in stats to new points calculationFelix Dörre
2015-02-25bug-1050: fix queries to calculate points according to 'new calculation'Felix Dörre
2015-02-25bug-1049: remove api/cemails.php as it is old and unused.bug-1049Felix Dörre
2015-02-25bug-1048: removing api/ccsr.php because it's unusedbug-1048Felix 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
2015-01-06bug 1043: Remove obsolete Site Seal script pointing nowhere anywaybug-1043Benny Baumann
2015-01-06bug 1043: Remove checks for the stamp.cacert.org hostBenny Baumann
2015-01-06bug 1043: Remove the stamp 'CAcert certified' code as this branch has been ↵Benny Baumann
dead for ages already.
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