summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-894 changed behavior of switch ... (php sucks ... ;-) )dirk
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-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-27bug-827 added italics line for $awarded=$points=0dirk
2011-09-27added italics line for awarded=points=0dirk
2011-09-27Merge branch 'tarballs' into releaseMichael Tänzer
2011-09-27Source code taken from cacert-20110927.tar.bz2Michael Tänzer
2011-09-25Merge branch 'bug-955' into releaseBernhard Fröhlich
2011-09-25Merge remote-tracking branch 'origin/bug-846' into bug-846bug-846Bernhard Froehlich
2011-09-24Merge branch 'release' of ↵Bernhard Froehlich
ssh://git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-846
2011-09-20Merge branch 'bug-940' into releaseBernhard Fröhlich
2011-09-20Merge branch 'bug-910' into releaseBernhard Fröhlich
2011-09-20bug-827 changed behaviour of awarded=nulldirk
2011-09-20bug-882 changed awarded=nulldirk
2011-09-20bug-894 removed debug-outputdirk
2011-09-20Merge branch 'release' of ↵dirk
ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-894
2011-09-20bug-882 changed behaviour of deleted accountsdirk
2011-09-20bug-827 added behavior of deleted accountsdirk
2011-09-16bug 940: fix checkin errorsMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-16bug 910: correct checkin errorsbug-910Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-16bug 975: Many fixes to the fixbug-975Michael Tänzer
- also include accounts without an entry in the email table when searching by id - revert the breakage of an indentation - always use backticks around non-SQL keywords or functions - fix a problem when the primary email had been deleted and readded before - use HTML to do the line breaking for us and fix typo Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-14Changes by moh for other certificate typesbug-596Bernhard Fröhlich
2011-09-14Merge branch 'release' of ssh://git-dev.cacert/var/cache/git/cacert-devel ↵Bernhard Fröhlich
into bug-596
2011-09-14Merge branch 'tarballs' into releaseMichael Tänzer
2011-09-14bug 955: Allow for the strings to be translated and make the sort orderbug-955Michael Tänzer
handling more readable Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-14Source code taken from cacert-20110914.tar.bz2Michael Tänzer
2011-09-14Proposed additional changes by Uli and Dirk ↵Bernhard Fröhlich
https://bugs.cacert.org/view.php?id=975#c2351
2011-09-14Merge branch 'release' of ssh://git-dev.cacert/var/cache/git/cacert-devel ↵Bernhard Fröhlich
into bug-975
2011-09-14bug 846: Don't break up string so translations are not garbled and presentMichael Tänzer
the full URL to the user -> don't confuse them Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-13bug 846: missing '=' slightly broke table layoutMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2011-09-13Merge branch 'tarballs' into releaseMichael Tänzer
2011-09-10Source code taken from cacert-20110910.tar.bz2Michael Tänzer
2011-09-07bug-882 corrected email-link for old pointsystemdirk
2011-09-07bug-827 corrected Unknown and 3rddirk
2011-09-07bug-882 corrected link for emaildirk