summaryrefslogtreecommitdiff
path: root/www
AgeCommit message (Collapse)Author
2018-11-19Local changes on the testservertestserver-1440root
2018-05-16Merge remote-tracking branch 'origin/bug-1431' into testserver-stableBernhard Fröhlich
2018-05-16Merge remote-tracking branch 'origin/bug-1439' into testserver-stableBernhard Fröhlich
# Conflicts: # www/cats/cats_import.php
2018-05-14bug 1439: Accept new and old convention for DN formatBernhard Fröhlich
Should also make sure that the code cannot be fooled so easily anymore.
2018-05-14Adjusted accepted IP to new testsystemBernhard Fröhlich
2018-03-05testing for photo-idsKarl-Heinz Gödderz
2015-06-06Merge branch 'bug-1042' into testserver-stableBenny Baumann
2015-06-02bug 1042: use the correct points function for sending assurance mailsFelix Dörre
2015-05-12Merge branch 'bug-1042' into testserver-stableBenny Baumann
2015-05-12Merge branch 'bug-1050' into bug-1042Benny Baumann
2015-05-12bug 1050: use the new function to correct points after adding a new assurance.Felix Dörre
2015-05-12bug 1050: fix using old variable names while assuringFelix Dörre
2015-05-09Merge branch 'bug-1383' into testserver-stableBenny Baumann
2015-05-09bug 1383: fix another undeclared variable ($rc)bug-1383Felix Dörre
2015-05-05Merge branch 'bug-1383' into testserver-stableBenny Baumann
2015-05-05bug 1383: cleanup ac.php, (undefined index, undefined offset)Felix Dörre
2015-05-05Merge branch 'bug-1042' into testserver-stableBenny 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-21bug 1047: refix www/index.phpFelix 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-11Merge branch 'bug-1341' into testserver-stableBenny 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 testserver-stableBenny 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-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-01-25Merge branch 'bug-649' into testserver-stableBenny Baumann
2015-01-25bug 649: Code formattingBenny Baumann
2015-01-25bug 649: code cleanupINOPIAE
2015-01-25bug 649: correction of id/oldid handlingINOPIAE
2015-01-25bug 649: some additional changes for the move from wot/16.php to wot/17.phpINOPIAE
2015-01-25Merge branch 'bug-1357' into testserver-stableBenny Baumann
2015-01-25bug 1357: added description for users on stats.php pagebug-1357INOPIAE
2015-01-25bug 1357: small correction for assurer calculationINOPIAE
2015-01-22Merge branch 'bug-1253' into testserver-stableBenny Baumann
Conflicts: includes/tverify_stuff.php pages/account/40.php pages/index/1.php pages/index/11.php
2015-01-21Merge branch 'release' into bug-1253Benny Baumann
2015-01-21bug 1253: Typo fix fatale -> fatalBenny Baumann
2015-01-21Merge branch 'bug-1361' into testserver-stableBenny Baumann
2015-01-21Merge branch 'bug-1317' into testserver-stableBenny Baumann
2015-01-21Merge branch 'bug-1355' into testserver-stableBenny Baumann
2015-01-20Merge branch 'bug-1354' into testserver-stableBenny Baumann