iglocska 1c6f45de52 Merge branch 'master' into 2.4-beta ... Conflicts: VERSION.json app/Controller/EventsController.php		2015-11-12 09:26:29 +01:00
..
ajax	Merge branch 'master' into 2.4-beta	2015-11-12 09:26:29 +01:00
admin_add.ctp	Further work on the Sharing Groups	2015-08-03 14:12:20 +02:00
admin_edit.ctp	Further work on the Sharing Groups	2015-08-03 14:12:20 +02:00
admin_email.ctp	New emailer finished	2015-05-27 17:46:01 +02:00
admin_filter_user_index.ctp	Update to the roles and user filtering	2015-04-07 14:47:14 +02:00
admin_index.ctp	Merge branch 'master' into feature/sg	2015-10-12 09:41:20 +02:00
admin_view.ctp	Fixed the Org field on the user view	2015-04-20 23:22:04 +02:00
change_pw.ctp	Further work on the UI	2013-10-24 16:41:42 +02:00
check_and_correct_pgps.ctp	mirated first parts of nice GUI proposed by Alexandru of CERT-EU	2013-05-30 11:14:00 +02:00
edit.ctp	Left off a file	2015-05-13 17:04:09 +02:00
histogram.ctp	Ajaxification of the event page done also, replaced histogram in memberslist	2014-05-02 14:29:15 +02:00
login.ctp	Fixed XSS in several views	2015-09-09 19:26:06 +02:00
memberslist.ctp	Cleanup and fixes to the memberslist	2015-08-31 03:08:49 +02:00
statistics.ctp	Merge branch 'master' into feature/sg	2015-09-10 15:02:44 +02:00
succes.ctp	mirated first parts of nice GUI proposed by Alexandru of CERT-EU	2013-05-30 11:14:00 +02:00
terms.ctp	Fix to the missing accept terms button	2014-10-31 14:59:49 +01:00
verify_g_p_g.ctp	More details on the PGP validation tool	2015-10-27 15:18:04 +01:00
view.ctp	Fixed the Org field on the user view	2015-04-20 23:22:04 +02:00