summaryrefslogtreecommitdiff
path: root/pages/wot
AgeCommit message (Collapse)Author
2014-12-16Merge branch 'release' into bug-1131bug-1131Benny Baumann
Conflicts: pages/wot/6.php www/policy/CAcertCommunityAgreement.php The conflict in the CCA document page was introduced due to the rename of the file. This instance can be safely ignored, as bug 1131 introduces a new version superseeding the old document. The instance in pages/wot/6.php is a bit more complicated, but basically results from a change of bug 1137 and the modified paths to the policy documents.
2014-07-27bug 1291: Another XSSBenny Baumann
2014-07-15Merge branch 'bug-1226' into releaseBenny Baumann
2014-07-15Merge branch 'bug-1283' into releaseBenny Baumann
2014-06-22bug 1226: Only consider values above 1900 as the year when returning a ↵bug-1226Benny Baumann
pre-filled form
2014-06-21bug 1226: Treat the date values as integerMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-06-21bug 1280: Implement normalisation in of language codes in the L10n classbug-1280Michael Tänzer
and use it (in set_translation() and the Assurer contact form) Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-06-21Revert "bug-1280: Parse the language code from the locale."Michael Tänzer
This reverts commit f3885b3bc9ff61da78fb541151f16b0ecfdf62eb.
2014-06-21Revert "bug-1280: Handle more different types of "languages":"Michael Tänzer
This reverts commit 0730c9df3eb440205d7963e3c0762765d9b47031.
2014-06-21Revert "bug-1280: Variable naming, formatting, php-syntax-error"Michael Tänzer
This reverts commit 6b1cd2a57b0aaa88374b1098df40cc6f73cdff5d.
2014-06-11bug-1280: Variable naming, formatting, php-syntax-errorFelix Dörre
2014-06-11bug-1280: Handle more different types of "languages":Felix Dörre
- zh_CN => zh-cn (in various cases: ZH_cn, zh_cn, ...) - de => de (what the current GUI produces) - de_DE => de, en_AU => en, EN_AU => en (what may be left in the database) ... and more creative upper/lower-cases
2014-06-11bug-1280: Parse the language code from the locale.Felix Dörre
Splitting the string at "_" and lowering the characters.
2014-06-10bug 1283: remove double encodingbug-1283Felix Dörre
The locales are already encoded in the Database.
2014-05-20bug 1138: fix double-escaping in wot/10Benny Baumann
2014-04-30bug 1138: Whitespace changes and code formattingBenny Baumann
2014-04-30bug 1138: And yet another bunch of escapingBenny Baumann
2014-03-21Merge branch 'release' into bug-1221Michael Tänzer
2014-03-21bug 1221: Fix "from" not being displayed in received pointsMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-01-26bug 1226: added dob to form assure someone wot/5.php, implemented check for ↵INOPIAE
dob match to account in not ttpadmin
2014-01-15Merge remote-tracking branch 'origin/bug-1137' into releaseMichael Tänzer
2013-11-26bug 1221: missing column in query for assurances dataBenny Baumann
2013-11-19bug 1221: WhitespaceBenny Baumann
2013-11-19bug 1221: added `deleted` = 0Benny Baumann
2013-11-19bug 1221: changed delete assurance to update "deleted = NOW()", added ↵Benny Baumann
`deleted` = 0 to all queries on notary
2013-10-09bug-1208: fix html typo 2ndbug-1208Martin Gummi
2013-10-09bug-1208: fix html typoMartin Gummi
2013-09-24bug 1137: Fix broken CCA linkMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-09-11bug-1208: all names shown on all text linesMartin Gummi
2013-09-11bug-1208: chg accountdetail.suffixMartin Gummi
2013-09-09bug 1208: Fix missing closing bracketsBenny Baumann
2013-09-09bug 1208: Only use up to 3 parts of the dateBenny Baumann
2013-09-09bug 1208: Better show where $name is usedBenny Baumann
2013-09-091208: Split long lines for better readabilityBenny Baumann
2013-09-09bug 1208: declare constants away from normal sourceBenny Baumann
2013-09-09bug-1208: prepare Name and DoB for highlightingMartin Gummi
2013-07-22Merge branch 'bug-1177' into bug-1137Benny Baumann
Conflicts: includes/notary.inc.php includes/wot.inc.php www/wot.php
2013-07-21bug 1177: Update include references from wot.inc.php to link to notary.inc.phpBenny Baumann
2013-06-26Merge branch 'release' into bug-1131Martin Gummi
2013-06-09bug 1137: corrected some checks in wot.inc.php and wot.phpINOPIAE
2013-05-13Merge branch 'bug-740' into releaseBenny Baumann
2013-04-23bug 740: adjusted olbug-740INOPIAE
2013-04-23bug 740: changed wordingINOPIAE
2013-04-23bug 740: Applied changes according to definition of AOINOPIAE
2013-04-16Merge branch 'bug-1112' into releaseMichael Tänzer
2013-03-29bug 740: Make link text translatableMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-03-19bug 740: Make the link text translatableMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-03-12bug 740: Do some minor rewording to make the text more fluent.Benny Baumann
2013-03-05bug 740: removed https from hrefs to wikiINOPIAE
2013-02-20bug 1112: Fix things popped up in review:Michael Tänzer
- whitespace/indentation - require vs. include and possible issue with relative path - wording - intval($id) - unnecessary change of language while the text is not sent through gettext anyway - do not use mysql_escape_string on email body - make strings easier to translate Signed-off-by: Michael Tänzer <neo@nhng.de>