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
..
base.html	Updated menus to include link to sending_profiles page	2016-02-20 16:39:23 -06:00
campaign_results.html	Merge branch 'master' into 78-store-smtp-settings	2016-02-28 22:08:39 -06:00
campaigns.html	Merge branch 'master' into 78-store-smtp-settings	2016-02-28 22:08:39 -06:00
dashboard.html	Updated menus to include link to sending_profiles page	2016-02-20 16:39:23 -06:00
docs.html	Updating API Document Files (Blueprint/HTML) to have the triple layout as well as an updated blueprint spec	2016-01-11 22:29:11 -06:00
flashes.html	Re-organizing files to use Jquery instead of Angular	2015-06-15 16:49:16 -05:00
gophish.apib	Updating API Document Files (Blueprint/HTML) to have the triple layout as well as an updated blueprint spec	2016-01-11 22:29:11 -06:00
landing_pages.html	Merge branch 'master' into 78-store-smtp-settings	2016-02-28 22:08:39 -06:00
login.html	Restricted registration to only logged in users. Fixes #137	2016-02-09 22:19:06 -06:00
register.html	Migrated settings (at least it loads).	2015-06-21 16:10:47 -05:00
sending_profiles.html	Making the Name column a bit wider so that the "Interface" column doesn't take up all the room.	2016-02-27 20:08:38 -06:00
settings.html	Updated menus to include link to sending_profiles page	2016-02-20 16:39:23 -06:00
templates.html	Cleaning up artifacts in modals on edit/copy/new for #143	2016-02-21 17:00:37 -06:00
users.html	Updated menus to include link to sending_profiles page	2016-02-20 16:39:23 -06:00