summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-22bug 411: fixed typobug-411INOPIAE
2013-10-22bug 411: added switch all certifcates - hide certificates on top and bottom ↵INOPIAE
of client and cert view
2013-09-09Merge branch 'bug-1190' into releaseBenny Baumann
2013-09-08Merge branch 'tarballs' into releaseMichael Tänzer
Conflicts: includes/account.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-09-08Source code taken from cacert-20130906.tar.bz2Michael Tänzer
2013-09-08Release: Remove left-over merge markersMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-09-06Merge branch 'merge-bug-1177-893-1136-1123-1137' into releaseBenny Baumann
Conflicts: www/gpg.php
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 remote-tracking branch 'origin/bug-663' into releaseMichael Tänzer
2013-08-25Merge branch 'bug-1198' into releaseMichael Tänzer
2013-08-25Merge branch 'bug-1200' into releaseMichael Tänzer
2013-08-25Merge branch 'release' into bug-1017bug-1017Michael Tänzer
Conflicts: pages/account/6.php Signed-off-by: Michael Tänzer <neo@nhng.de>
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 '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-20bug 1190: force linebreaks to be visible on the frontpagebug-1190Benny Baumann
2013-08-20bug-1190: improve links for mobile devicesBenny Baumann
2013-08-14bug 1190: RSS may contain HTML markup => decode it and then encode it againMichael 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-08bug 1200: Fix missing dollar sign before error handlingbug-1200Benny Baumann
2013-08-07bug 1200: Doh, STDOUT is the *third* parameter of runCommand()Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-07bug 1200: Use a freshly created temporary directory as gpg homedirMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-07bug 1200: Use runCommand() to execute gpg to avoid using an unneeded tempfileMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-07bug 1199: Remove left over debugging codeMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
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-31bug-1198: Non-functional clean-ups (wording, markup)bug-1198Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug-1198: crop the payment icon to the same size as the subscribe iconMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug-1198: Use EUR because the Euro sign was not properly displayedMichael Tänzer
2013-07-30bug-1198: Update the membership fee buttonsMichael 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