summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-27bug 413: Backport changes from 7aced740 by Michael Tänzer to avoid ↵Benny Baumann
conflicts when integrating both together
2014-02-23bug 413: modified sql statement for org server certsINOPIAE
2014-02-23bug 413: modified the sql statement for org client certsINOPIAE
2014-02-23bug 413: modified sql statement for server certificatesINOPIAE
2014-02-23bug 413: modified sql-statement for vie client certificiatesINOPIAE
2014-02-05Merge branch 'bug-1244' into releaseMichael Tänzer
2014-02-05Merge branch 'bug-1218' into releaseMichael Tänzer
2014-02-04bug 1244: Add introductory text to the front page.Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-02-04Merge branch 'tarballs' into releaseMichael Tänzer
2014-02-04Source code taken from cacert-20140115.tar.bz2Michael Tänzer
2014-01-15Merge remote-tracking branch 'origin/bug-440' into releaseMichael Tänzer
2014-01-15Merge branch 'release' into bug-440bug-440Michael Tänzer
Conflicts: includes/account.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-01-15Merge remote-tracking branch 'origin/bug-1137' into releaseMichael Tänzer
2014-01-15Merge remote-tracking branch 'origin/bug-1195' into releaseMichael Tänzer
2014-01-15Merge branch 'release' into bug-1195bug-1195Michael Tänzer
Conflicts: includes/account.php pages/account/6.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-01-15Merge remote-tracking branch 'origin/bug-1229' into releaseMichael Tänzer
2014-01-15Merge remote-tracking branch 'origin/bug-1236' into releaseMichael Tänzer
2014-01-14Merge remote-tracking branch 'origin/bug-1237' into releaseMichael Tänzer
2014-01-14Merge remote-tracking branch 'origin/bug-1135' into releaseMichael Tänzer
2014-01-08bug 1237: Fix a typo ...bug-1237Benny Baumann
2014-01-08bug 1237: Declare variables before useBenny Baumann
2014-01-08bug 1229: Another spelling mistakebug-1229Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-01-08bug 1229: Fix some spelling mistakesMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-01-08bug 1237: Properly parse Message Digest from databaseBenny Baumann
2014-01-08bug 1236: moved hidden field linebug-1236INOPIAE
2014-01-08bug 1236: Corrected showdetail handlingINOPIAE
2014-01-07bug 1236: Use single assignment for global variablesBenny Baumann
2014-01-06bug 1236: Fixed show detail problemINOPIAE
2013-12-11bug 1229: "CA" -> "certificate authority (CA)"Eva Stöwe
2013-12-10bug 1229: TypoBenny Baumann
2013-12-10bug 1229: Do some minor rewordingBenny Baumann
2013-12-10bug 1229: Initial wording for the reasoning why valid names and DoB ↵Eva Stöwe
information is required for account registration Signed-off-by: Benny Baumann <BenBE@geshi.org>
2013-11-27Bug 1135: Make scripts executablebug-1135Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-27Bug 1135: Fix SQL queries in many ways:Michael Tänzer
- Add semicolons - uniform definition of `information` column - capitalisation of table names - name the output file for adminlog backup Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-27Bug 1135: 0 is the real version before versioning, the others are just fakeMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-26bug 1135: added some columnsINOPIAE
2013-11-20Merge branch 'tarballs' into releaseMichael Tänzer
2013-11-20Source code taken from cacert-20131120.tar.bz2Michael Tänzer
2013-11-20Merge remote-tracking branch 'origin/bug-1045' into releaseMichael Tänzer
2013-11-20Merge remote-tracking branch 'origin/bug-1064' into releaseMichael Tänzer
2013-11-20Merge branch 'bug-1010' into releaseMichael Tänzer
2013-11-20Merge branch 'bug-1004' into releaseMichael Tänzer
2013-11-20Bug 1218: Exportable flag needs to be explicitly set on Win XPbug-1218Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-19Bug 1218: Allow exporting private keys in IEMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-06Merge remote-tracking branch 'origin/bug-1219' into releaseMichael Tänzer
2013-11-06Merge remote-tracking branch 'origin/bug-1213' into releaseMichael Tänzer
2013-11-06Merge branch 'release' into bug-440Michael Tänzer
Conflicts: includes/account.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-06bug 440: Trailing whitespaceMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-06bug 440: Use convenience function to extract the domains from the session ↵Michael Tänzer
variables Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-05bug 1195: added disabled for login checkboxINOPIAE