summaryrefslogtreecommitdiff
path: root/pages
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-06Merge branch 'merge-bug-1177-893-1136-1123-1137' into releaseBenny Baumann
Conflicts: www/gpg.php
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 '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-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-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-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: 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 colspan values for old display of assurance pointsBenny Baumann
2013-07-22Merge branch 'bug-893' into bug-1136Benny Baumann
Conflicts: includes/temp_functions.php pages/account/43.php
2013-07-22Merge branch 'bug-1177' into bug-1137Benny Baumann
Conflicts: includes/notary.inc.php includes/wot.inc.php www/wot.php
2013-07-21Merge branch 'bug-1177' into bug-893Benny Baumann
Conflicts: includes/account.php
2013-07-21bug 1177: Update include references from wot.inc.php to link to notary.inc.phpBenny Baumann
2013-07-15bug 1190: Use double quoted strings to allow line breaksMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: DohMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: Limit number of news itemsMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: properly handle entitiesMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: Fix possible code injectionMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-14Merge alternate branch 'bug-1190' by magu into bug-1190Benny Baumann
2013-07-14bug-1190: white spaceMartin Gummi
2013-07-14bug 1123: fixed merge conflicts on testserverBenny Baumann
2013-07-14bug 1123: added layout changesBenny Baumann
2013-07-14bug 1123: implement CCA acception for client certsBenny Baumann
2013-07-14bug-1190: Change parsing of new feed from blog.cacert.org via XML ParserMartin Gummi
2013-07-14bug 1123: changed layout of pages/account/3.phpBenny Baumann
2013-07-14bug 1190: changed length parameter to adjust the text for <!CDATA[ ]]> for ↵INOPIAE
the description
2013-07-12Merge branch 'bug-782' into releaseBenny Baumann
2013-07-12Merge branch 'bug-1176' into releaseBenny Baumann
2013-07-09bug 663: changed if statement and corrected typobug-663INOPIAE
2013-07-09bug 663: changed Unconditional Variable Assignment instead of if-condition ↵INOPIAE
for $showdetails
2013-07-09bug 663: changed that secret q&a only be visible if requestedINOPIAE
2013-06-25Merge branch 'bug-1102' into releaseBenny Baumann
2013-06-25bug 1176: Ensure that the notary table to show was given before determining ↵Benny Baumann
which one
2013-06-25bug 1176: User ID not always initialized properlyBenny Baumann
2013-06-25Merge branch 'bug-1008' into releaseBenny Baumann
2013-06-25Merge branch 'bug-999' into releaseBenny Baumann
2013-06-23bug 782: removed previous echo, fixed update sql in account.php, added ↵INOPIAE
missing form tag in gpg/2.php