summaryrefslogtreecommitdiff
path: root/includes
AgeCommit message (Collapse)Author
2014-01-26bug 550: added output for org server certifcatesbug-550INOPIAE
2014-01-26bug 550: fixed the wording for org client outputINOPIAE
2014-01-26bug 550: moved the output of the organisation client certificates to ↵INOPIAE
notary.inc.php
2014-01-26bug 550: moved orgclientcertificate sql statement to notary.inc.phpINOPIAE
2014-01-23bug 550: formatting output oa logINOPIAE
2014-01-21bug 550: added recording of revokeorgadminid while revoking an organisation ↵INOPIAE
certifcate
2014-01-21bug 550: added orgadmin id to all org certificate creationINOPIAE
2014-01-21bug 550: added output functions for OA history and implemented OA history outputINOPIAE
2014-01-21bug 550: added function org_admin_delete and implemented the functionINOPIAE
2014-01-21bug 550: added function org_admin_add and implemented the function in the ↵INOPIAE
process
2014-01-21bug 550: added function org_delete and implemented it as part of the ↵INOPIAE
ogranisation account deletion
2014-01-21bug 550: added function org_domain_delete and impleneted it in the process ↵INOPIAE
of deleting an organisation domain
2014-01-21bug 550: added function org_domain_change and implemented it in the ↵INOPIAE
organisation domain change process
2014-01-21bug 550: added function org_domain_add and implemented it into the process ↵INOPIAE
to add a organisation domain
2014-01-21bug 550: added function org_change and implemented it in the organisation ↵INOPIAE
account change process
2014-01-21bug 550: added functions write_org_log and org_create and implemented them ↵INOPIAE
during org account creation process
2014-01-15Merge branch 'release' into bug-440bug-440Michael Tänzer
Conflicts: includes/account.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-01-15Merge remote-tracking branch 'origin/bug-1137' into releaseMichael Tänzer
2014-01-15Merge branch 'release' into bug-1195bug-1195Michael Tänzer
Conflicts: includes/account.php pages/account/6.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2014-01-08bug 1236: Corrected showdetail handlingINOPIAE
2014-01-07bug 1236: Use single assignment for global variablesBenny Baumann
2014-01-06bug 1236: Fixed show detail problemINOPIAE
2013-11-20Merge branch 'bug-1010' into releaseMichael Tänzer
2013-11-06Merge branch 'release' into bug-440Michael Tänzer
Conflicts: includes/account.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-06bug 440: Trailing whitespaceMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-06bug 440: Use convenience function to extract the domains from the session ↵Michael Tänzer
variables Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-11-05bug 440: Whitespace fixupBenny Baumann
2013-10-30bug 1010: Also carry over the OU when renewing the certificateMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-10-29bug 1010: Also add OU to the database when in MS banchMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-10-16Merge branch 'bug-569' into releaseBenny Baumann
2013-10-15Merge branch 'bug-918' into releaseBenny Baumann
2013-10-02bug 1137: Missing space in SQL querybug-1137Michael Tänzer
2013-10-01bug 1137: corrected the function for the user_agreement and added comments ↵INOPIAE
for the functions
2013-09-10bug-1208: remove colon in notary.inc.phpMartin Gummi
2013-09-06Merge branch 'merge-bug-1177-893-1136-1123-1137' into releaseBenny Baumann
Conflicts: www/gpg.php
2013-09-03bug 1177: Remove unused functionMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-09-01Change proposed during reviewBernhard Fröhlich
2013-08-28bug 569: Fix wordingbug-569Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-25Merge remote-tracking branch 'origin/bug-663' into releaseMichael Tänzer
2013-08-24Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137Michael Tänzer
2013-08-24bug 1137: mysql_real_escape() fields in user_agreements although they ↵Michael Tänzer
usually are not user provided, just to be sure Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-14Merge branch 'bug-893' into merge-bug-1177-893-1136-1123-1137Michael Tänzer
2013-08-14bug 893: domaincerts has no column memid, it has to be referenced via domainsbug-893Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-13Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137Benny Baumann
Conflicts: includes/account.php pages/account/10.php pages/account/3.php pages/gpg/0.php www/gpg.php
2013-08-13Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137Benny Baumann
Conflicts: includes/notary.inc.php
2013-08-06bug 1136: Fix things that got lost in a merge some time agobug-1136Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-06bug 1136: Use optimised SQL query from bug #922Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-08-06Merge branch 'bug-893' into bug-1136Michael Tänzer
Conflicts: includes/notary.inc.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug 893: Doh, forgot to adjust variable after copy & pasteMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-31bug 893: A bit more efficiency in account_delete()Michael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>