summaryrefslogtreecommitdiff
path: root/pages
AgeCommit message (Collapse)Author
2012-07-23Merge branch 'release' into bug-964Michael Tänzer
2012-05-30Merge branch 'bug-1023' into releaseMichael Tänzer
2012-05-23bug 1023: Adjust the explanation for the dateMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-05-09bug-1023 fixed some flaws detected by software reviewroot
2012-04-29Merge branch 'bug-1011' into releaseMichael Tänzer
2012-04-15bug 1027: Doh, missing slashbug-1027Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-04-04bug 1027: use the same content on the logged in and logged out siteMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-04-03bug 1027: Add reference to booking.com affiliate programMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-03-28bug-1023 added method for board ... hopefully ... ;-)root
2012-03-28bug 1023 refixed date/locationroot
2012-03-28bug 1023 changed methods for ttpadminroot
2012-03-11Merge branch 'bug-1023' of ↵root
ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-1023
2012-03-21bug 1023: Fix from magu for the location showing up in the date fieldMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-03-11bug 1023 added the two missing lines, which caused the race condition by ↵root
their absence
2012-03-11bug-1023 changed 6.php to new coding (preparation for ↵root
thawte-points/PoJAM/...) ... makecap not yet implemented
2012-03-01bug 1019: Doh, it's printf not sprintf, and make the string translatableMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-03-01bug 1019: Disable the logged-in contact form until the underlying problemMichael Tänzer
is fixed Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-02-08bug 1011: Move HTML markup out of the translationbug-1011Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-01-24Merge remote-tracking branch 'origin/bug-985' into releaseMichael Tänzer
2012-01-19Merge branch 'release' into bug-855bug-855Bernhard Fröhlich
2012-01-10Merge branch 'release' into bug-985bug-985Michael Tänzer
Conflicts: www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-01-05Merge branch 'bug-794' into releaseBernhard Fröhlich
2012-01-05fixed rebase conflictsbug-794Bernhard Fröhlich
2012-01-05bug 794: complete rewrite of the patchMichael Tänzer
- explicitly query for valid certs - let MySQL figure out most of the stuff (don't use loops and subqueries in those loops and so on) - minor improvements Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-12-26Merge branch 'bug-957' into releaseMichael Tänzer
2011-12-21bug 964: Doh. require() confusion.Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-12-21bug 964: Patches from Brian Dawson: allow selection of keysize in IEMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-12-06bug 794: complete rewrite of the patchMichael Tänzer
- explicitly query for valid certs - let MySQL figure out most of the stuff (don't use loops and subqueries in those loops and so on) - minor improvements Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-24bug 957: Remove executable permissions from data filesbug-957Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-24Merge branch 'bug-940' into releaseMichael Tänzer
2011-11-24Merge branch 'bug-965' into releaseMichael Tänzer
2011-11-24Synchronise file permissions with tarballs (removes execution permissionMichael Tänzer
from various files) Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-24bug 940: Remove execution permissions from data filebug-940Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-24bug 965: remove execution permissions from data filesbug-965Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-23Merge branch 'release' of ↵dirk
ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-894
2011-11-20Merge branch 'bug-966' into releaseMichael Tänzer
2011-11-06bug 976: Typo and maskingbug-976Michael Tänzer
`oemail` masks `orgemailcerts` so that won't work anymore Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-05bug 976: Fixing ambiguous references in SQLMichael Tänzer
which were introduced by adding new columns on existing tables used in an SQL query on multiple tables which did not qualify the particular table of the columns used. -> MySQL returned an error which was not handled properly by the code and "No client certificates are currently listed." was displayed instead. Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-25Merge commit 'origin/bug-894' into bug-894dirk
2011-10-23bug 894: A few cleanups and bug fixes.Michael Tänzer
- "A reminder notice has been sent." should be only shown once at the same page - "You are not an Assurer" was misleading, only somehow the other user was not recorded in the session (e.g. URL manipulation/hotlinking) - Reuse the data fetched moments ago instead of doing another SQL query - Compare instead of assignment - Make "Go Back" translatable Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-20Merge branch 'bug-846' into releaseBernhard Fröhlich
2011-10-16bug 985: move binding to a gettext domain into a separate method andMichael Tänzer
update some more legacy language handling removed screenshot() as it's never used and language dependent still open: translation in PDFs Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-16bug 985: replace occurences of $_SESSION['_config']['translations']Michael Tänzer
this includes a little rewrite of reminder handling Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-12Merge remote-tracking branch 'origin/bug-596' into releaseMichael Tänzer
2011-10-11Merge remote-tracking branch 'origin/bug-975' into releaseMichael Tänzer
2011-10-08Changes proposed by Uli on https://bugs.cacert.org/view.php?id=855Bernhard Fröhlich
2011-10-05Merge branch 'bug-882' into releaseBernhard Fröhlich
2011-10-05Revert "Undone checkin error"Bernhard Fröhlich
This reverts commit de76c631f9b6aff1500479da059e8a8457c19dd9.
2011-10-05Undone checkin errorBernhard Fröhlich
2011-09-25Merge branch 'bug-955' into releaseBernhard Fröhlich