Jordan Wright 6b61b24f68 Merge branch 'master' into 78-store-smtp-settings ... # Conflicts: # models/models_test.go # static/js/app/landing_pages.js		2016-02-28 22:08:39 -06:00
..
campaign_results.js	Merge pull request #174 from gophish/148-polling	2016-02-24 21:26:32 -06:00
campaigns.js	Merge branch 'master' into 78-store-smtp-settings	2016-02-28 22:08:39 -06:00
dashboard.js	Added basic polling updates for the charts. Made the call to get campaign results be async.	2016-02-21 20:55:27 -06:00
landing_pages.js	Merge branch 'master' into 78-store-smtp-settings	2016-02-28 22:08:39 -06:00
sending_profiles.js	Updated js on sending_profiles page to work with updated /util/send_test_email	2016-02-27 08:34:33 -06:00
settings.js	Formatting Javascript using js-beautifier	2016-01-16 22:59:40 -06:00
templates.js	More cleaning up artifacts in modals on edit/copy/new for #143	2016-02-22 05:57:03 -06:00
users.js	Merge branch 'table-style' of https://github.com/StrangeUSB/gophish into StrangeUSB-table-style	2016-01-20 21:53:12 -06:00