summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-14bug-1192: changed text on index/52.phpbug-1192INOPIAE
2014-09-30bug-1192: added explanation textINOPIAE
2014-02-26bug 1192: Do not manually encode URIs, saves a lot of code and uglinessMichael Tänzer
(and probably little kittens). Also HTTP headers start with upper case letters Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-02-26bug 1192: Authentication is done in the previous step so don't setMichael Tänzer
$_SESSION['profile']['loggedin'] at all, only check it Also if there was an oldlocation set redirect to it Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-02-26bug 1192: Store oldlocation for convenience of the user and improve codingMichael Tänzer
style Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-02-26bug 1192: Text changes in the CCA acceptance viewMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-02-26bug 1192: White spaceMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-02-22bug 1192: moved the CCA check to the loggedin.php filemam
2014-02-05bug 1192: fixed sprintf statementINOPIAE
2014-01-29bug 1192: added file 52.php to the git branchINOPIAE
2014-01-21bug 1192: added check for empty $_SESSION['_config']['oldlocation']INOPIAE
2013-09-21bug 1192: changed the client login procedure, took out echoINOPIAE
2013-09-20bug 1192: work on CCA agreementINOPIAE
2013-09-20bug 1192: typo fix in index/52.php, logical fix in index.phpINOPIAE
2013-09-20bug 1192: changes for find CCA agreementINOPIAE
2013-09-20bug 1192: added some echo for testingINOPIAE
2013-09-17bug 1192: changed variableINOPIAE
2013-09-17bug 1192: added echo for testINOPIAE
2013-09-14bug 1192: added reference to notary.inc.phpINOPIAE
2013-09-14bug 1192: change call of index/52.phpINOPIAE
2013-09-14bug 1192: added the CCA check during loginINOPIAE
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>