summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-11-20Merge branch 'bug-968' into releaseMichael Tänzer
2011-11-20Merge branch 'bug-966' into releaseMichael Tänzer
2011-11-20Source code taken from cacert-20111116.tar.bz2Michael Tänzer
2011-11-20Merge branch 'bug-976' into releaseMichael Tänzer
2011-11-17bug 965: Also adjust the links to the replaced pagesMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-15Merge branch 'bug-882' into releaseMichael Tänzer
2011-11-15Merge branch 'bug-827' 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-11-04bug 976: allow multiple entries in schema_version, each entry marks aMichael Tänzer
migration Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-04bug 976: Initial version of the database migration script.Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-02bug 882: port the date restriction to the support sectionbug-882Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-11-02bug 827: the date when the column "awarded" was added was actuallyMichael Tänzer
2006-09-01 Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-26Merge branch 'bug-882' into releaseMichael Tänzer
2011-10-26Merge branch 'bug-827' into releaseMichael Tänzer
2011-10-26bug-827 changed if to max ;-)dirk
2011-10-26bug-882 removed test file ...dirk
2011-10-26bug-882 resolved merge conflict ...dirk
Merge commit 'origin/bug-882' into bug-882 Conflicts: includes/notary.inc.php
2011-10-26bug-882 awarded/points-functionality for supportdirk
2011-10-25Merge commit 'origin/bug-894' into bug-894dirk
2011-10-25Merge branch 'release' of ↵dirk
ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-894
2011-10-25bug 855: correct case for the string comparison.Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-25bug-827 added points/awarded logic for given assurancesdirk
2011-10-23bug 894: Limiting the points is still critical as the points are also usedMichael Tänzer
for authorization (e.g. maxpoints() relies on the value of sum(`points`) to calculate the points an assurer may issue) Signed-off-by: Michael Tänzer <neo@nhng.de>
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-21Merge branch 'tarballs' into releaseMichael Tänzer
2011-10-21Source code taken from cacert-20111021.tar.bz2Michael Tänzer
2011-10-20Merge branch 'bug-846' into releaseBernhard Fröhlich
2011-10-18bug 827 restriced yellow marker <2006-09-1dirk
2011-10-18bug-894 changed behavior of switch ... (php sucks ... ;-) )dirk
2011-10-18bug 985: Doh, never copy and paste codeMichael Tänzer
I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. I shall never again use copy and paste for coding. Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-17bug 985: Fix PDF generation for Japanese ("ja_JP" is now "ja" in theMichael Tänzer
translation settings) Signed-off-by: Michael Tänzer <neo@nhng.de>
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-16bug 985: doh, actually return somethingMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-10-16bug 985: Factor out language handling into a separate class, also fixMichael Tänzer
language handling for Internet Explorer. TODO: - replace all uses of $_SESSION['_config']['language'] and $_SESSION['_config']['translations'] with the appropriate calls to the new class - adjust character handling in the PDF generation routines - probably more 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-11Merge branch 'tarballs' into releaseMichael Tänzer
2011-10-11Source code taken from cacert-20111007.tar.bz2Michael Tänzer
2011-10-08Changes proposed by Uli on https://bugs.cacert.org/view.php?id=855Bernhard Fröhlich
2011-10-07Merge branch 'bug-827' into releaseBernhard Froehlich
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-28bug 882: highlight rows where points==awarded==0 in support interfaceMichael Tänzer
Patch provided by Uli60 Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-28bug 827: color the emphasized rowsMichael Tänzer
Patch supplied by Uli60 Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-28bug 985: map language to the right locale and other fixesMichael Tänzer
- map from two letter to five letter code - if lang is given as parameter but $_SESSION['_config']['language'] has already been set also go into the translation handling code - preg_filter() is PHP >= 5.3 Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-28bug 985: move from Translingo to Pootle (translations.cacert.org)Michael Tänzer
- new Makefile - rework translation selection code - remove unused files Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-28bug 985: add all possible locales and use new directory layoutMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>