summaryrefslogtreecommitdiff
path: root/pages
AgeCommit message (Collapse)Author
2015-01-20Merge branch 'bug-1354' into testserver-stableBenny Baumann
2015-01-20bug-1354: fix the escaping function for gpg-key-commentsbug-1354Felix Dörre
2015-01-14Merge branch 'bug-1355' into testserver-stableBenny Baumann
Conflicts: includes/general.php tverify/index.php
2015-01-14Merge branch 'bug-1129' into testserver-stableBenny Baumann
Conflicts: pages/account/13.php
2015-01-14FROMAT: If-Block in 13.php (see bug #612)Janis Streib
2015-01-14bug-1129: added notification mail for insight to secret Q&A from SEJanis Streib
interface (see bug-612)
2015-01-13bug 1355: remove file 51.php 52.phpMartin Gummi
2015-01-13bug 1355: remove commented tverify stuff 43.phpMartin Gummi
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-12-05Merge remote-tracking branch 'origin/bug-790' into releaseMichael Tänzer
2014-12-02Merge branch 'bug-1302' into testserver-stableBenny Baumann
2014-12-02bug-1302: double link removedbug-1302Martin Gummi
2014-12-02Merge branch 'bug-1282' into testserver-stableBenny Baumann
2014-12-02Merge branch 'bug-1302' into testserver-stableBenny Baumann
2014-12-02bug-1282: fix some creepy whitespace thingsbug-1282Felix Dörre
2014-12-02bug-1282: (related) fix the redirection-feature for domain searchFelix Dörre
2014-12-02bug-1302: change text 40.phpMartin Gummi
2014-12-02Merge branch 'bug-1282' into testserver-stableBenny Baumann
2014-12-02bug 1282: added comment for search about id in search page account/48.phpBenny Baumann
2014-12-02bug 1282: changed the check routine for IDINOPIAE
2014-12-02bug-1302: uppercase to lowercase 40.phpMartin Gummi
2014-12-02bug-1302: modify link to wiki -> LostPasswordOrAccountMartin Gummi
2014-12-02bug-1302: change descriptions textMartin Gummi
2014-12-02bug-1302: uppercase to lowercaseMartin Gummi
2014-12-02bug-1302: update copyrightMartin Gummi
2014-11-23Merge branch 'bug-1273' into releaseBenny Baumann
2014-11-23Merge branch 'bug-1192' into releaseBenny Baumann
2014-11-18Merge branch 'bug-1339' into testserver-stableBenny Baumann
2014-11-18Merge branch 'bug-1339' into releaseBenny Baumann
2014-11-15bug-1339: remove all traces of OTPbug-1339Felix Dörre
2014-10-28Merge branch 'bug-1316' into testserver-stableBenny Baumann
2014-10-28bug 1316: replaced revoke assurance by new function revoke_assuranceINOPIAE
2014-10-15Merge branch 'bug-1304' into testserver-stableBenny Baumann
2014-10-14bug-1304: Fix the remaining ) in WoT/Rulesbug-1304Felix Dörre
2014-10-14Merge branch 'bug-1304' into testserver-stableBenny Baumann
2014-10-14bug-1304: update wot/rules according to current telco meetingFelix Dörre
2014-10-14Merge branch 'bug-1192' into testserver-stableBenny Baumann
2014-10-14bug-1192: changed text on index/52.phpbug-1192INOPIAE
2014-10-14Merge branch 'bug-1304' into testserver-stableBenny Baumann
2014-10-08bug-1304: Updated the text "WOT/Rules"Felix Dörre
(as in the pad of today's telco)
2014-10-07Merge branch 'bug-790' into testserver-stableBenny Baumann
2014-10-07bug-790: update the text for orgClientCertbug-790Felix Dörre
According to common decision in SAP meeting.
2014-10-07bug-790: Add a descriptive text for orgClient ...Felix Dörre
... to help people to see where the CSR should go.
2014-09-30Merge branch 'bug-1192' into testserver-stableBenny Baumann
2014-09-30bug-1192: added explanation textINOPIAE
2014-09-24Merge branch 'bug-790' into testserver-stableBenny Baumann
2014-09-23bug-709: change spkac-text, wrap crt with <pre>sFelix Dörre
2014-09-23Merge branch 'bug-790' into testserver-stableBenny Baumann
2014-09-23bug-790: do translation, fix cert downloadFelix Dörre
2014-09-23Merge branch 'bug-790' into testserver-stableBenny Baumann