summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-03Merge branch 'merge-bug-1177-893-1136-1123-1137' into ↵merge-bug-1177-893-1136-1123-1137-testserverMichael Tänzer
merge-bug-1177-893-1136-1123-1137-testserver
2013-09-03bug 1137: Revert patch from Ted, because of inconsistencies. Also fix a typo ↵merge-bug-1177-893-1136-1123-1137Benny Baumann
in the comment above
2013-09-03bug 1177: Remove unused functionMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-09-01Replaced "Trusted 3rd Parties" by "Trusted Third Parties", "Trusted 3rd ↵Bernhard Fröhlich
Parties" is not documented
2013-09-01Change proposed during reviewBernhard Fröhlich
2013-08-25Merge branch 'merge-bug-1177-893-1136-1123-1137' into ↵Michael Tänzer
merge-bug-1177-893-1136-1123-1137-testserver
2013-08-25Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137Michael Tänzer
Conflicts: pages/account/10.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-25Merge branch 'release' into bug-1123bug-1123Michael Tänzer
Conflicts: includes/account.php pages/account/10.php pages/account/3.php pages/gpg/0.php www/gpg.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-25Revert "bug 1123: fixed merge conflicts on testserver"Michael Tänzer
This reverts commit 75693292de2d907bf2a4b0f12abd7cd68781f95a.
2013-08-24Merge branch 'testserver-mods' into merge-bug-1177-893-1136-1123-1137-testserverMichael Tänzer
2013-08-24Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137Michael Tänzer
2013-08-24bug 1137: get rid of the board flag, which has already been removed in the ↵Michael Tänzer
release branch but somehow this change got lost in this branch (during merge conflict resolution) Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-24bug 1137: setting the "certify" check box should depend on the method ↵Michael Tänzer
selected not on whether one is TTP Assurer Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-24bug 1137: mysql_real_escape() fields in user_agreements although they ↵Michael Tänzer
usually are not user provided, just to be sure Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-20Testserver pseudo-feed: remove extraneous newlinestestserver-modsMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-20Testserver Pseudo Feed: WhitespacingMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-14Merge branch 'bug-893' into merge-bug-1177-893-1136-1123-1137Michael Tänzer
2013-08-14bug 893: domaincerts has no column memid, it has to be referenced via domainsbug-893Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-13Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137Benny Baumann
Conflicts: includes/account.php pages/account/10.php pages/account/3.php pages/gpg/0.php www/gpg.php
2013-08-13Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137Benny Baumann
Conflicts: includes/notary.inc.php
2013-08-06bug 1136: Fix things that got lost in a merge some time agobug-1136Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-06bug 1136: Use optimised SQL query from bug #922Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-06Merge branch 'bug-893' into bug-1136Michael Tänzer
Conflicts: includes/notary.inc.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug 893: Doh, forgot to adjust variable after copy & pasteMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug 893: A bit more efficiency in account_delete()Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug 893: Always trim() arbitration numberMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug 893: Also add the check for the revocation date to the non-CCA versionMichael Tänzer
of check_*_cert_running() Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug 893: Use optimised SQL query from bug #922Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-23Merge branch 'bug-1177' into bug-1137Benny Baumann
2013-07-23Merge branch 'bug-893' into bug-1136Benny Baumann
2013-07-23Merge branch 'bug-1177' into bug-893Benny Baumann
2013-07-23bug 1177: Fix table for supportbug-1177Benny Baumann
2013-07-23bug 1177: Fix the assurance tablesBenny Baumann
2013-07-23bug 1177: Fix colspan values for old display of assurance pointsBenny Baumann
2013-07-23bug 1177: Make the support parameter optionalBenny Baumann
2013-07-23bug 1177: Additional space when showing view for supportBenny Baumann
2013-07-22Merge branch 'bug-893' into bug-1136Benny Baumann
Conflicts: includes/temp_functions.php pages/account/43.php
2013-07-22bug 893: Remove temp_functions.phpBenny Baumann
2013-07-22bug 1137: Fix typo in check_date_differenceBenny Baumann
2013-07-22bug 1137: Remove duplicated code causing a blnk pageBenny Baumann
2013-07-22Merge branch 'bug-1177' into bug-1137Benny Baumann
Conflicts: includes/notary.inc.php includes/wot.inc.php www/wot.php
2013-07-21bug 1137: Move extra code from wot.inc.php to notary.inc.phpBenny Baumann
2013-07-21bug 893: Fix indentation to make code-flow more obviousBenny Baumann
2013-07-21Merge branch 'bug-1177' into bug-893Benny Baumann
Conflicts: includes/account.php
2013-07-21bug 1177: Removing now obsolete wot.inc.phpBenny Baumann
2013-07-21bug 1177: Update include references from wot.inc.php to link to notary.inc.phpBenny Baumann
2013-07-21bug 1177: Do some formatting/indentation workBenny Baumann
2013-07-21bug 1177: Port other changes done in wot.inc.php but not notary.inc.phpBenny Baumann
2013-07-21bug 1177: Include functions from wot.inc.php into notary.incBenny Baumann
2013-07-16Merge branch 'release' of ↵Benny Baumann
ssh://git-cacert.it-sls.de/var/cache/git/cacert-devel into release