summaryrefslogtreecommitdiff
path: root/includes
AgeCommit message (Collapse)Author
2013-11-20Merge branch 'bug-1010' into releaseMichael Tänzer
2013-10-30bug 1010: Also carry over the OU when renewing the certificateMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-10-29bug 1010: Also add OU to the database when in MS banchMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-10-16Merge branch 'bug-569' into releaseBenny Baumann
2013-10-15Merge branch 'bug-918' into releaseBenny Baumann
2013-09-10bug-1208: remove colon in notary.inc.phpMartin Gummi
2013-09-06Merge branch 'merge-bug-1177-893-1136-1123-1137' into releaseBenny Baumann
Conflicts: www/gpg.php
2013-09-03bug 1177: Remove unused functionMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-09-01Change proposed during reviewBernhard Fröhlich
2013-08-28bug 569: Fix wordingbug-569Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-25Merge remote-tracking branch 'origin/bug-663' into releaseMichael Tänzer
2013-08-24Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137Michael Tänzer
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-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: 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: 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-16bug 1010: fixed variable typoINOPIAE
2013-07-14bug 1010: Fixed variable namesINOPIAE
2013-07-14bug 1123: fixed merge conflicts on testserverBenny Baumann
2013-07-14bug 1123: added functionality to www/gpg.phpBenny Baumann
2013-07-14bug 1123: implement CCA acception for client certsBenny Baumann
2013-07-13bug 1010: used trinary operator for variable declaration, changed white ↵INOPIAE
space /tabs, typo and added orginfo.O to order in SQL statement