Commit graph

815 commits

Author SHA1 Message Date
Jordan Wright
d43a888b26 Updating gorm constructs to support gorm v1.0 released yesterday. 2016-03-08 22:37:55 -06:00
Jordan Wright
095da00a05 Merge branch 'master' of github.com:gophish/gophish 2016-03-08 21:37:40 -06:00
Jordan Wright
1062d1b3b8 Adding colors for the timeline 2016-03-08 21:37:30 -06:00
Jordan Wright
88d1d4106e Merge pull request #192 from rcutmore/fix-file-input-button-focus
Fix issue when tabbing to file input button
2016-03-07 21:55:20 -06:00
Rob Cutmore
7130b7a249 Fix issue when tabbing to file input button
Previously when tabbing to a file input button the button text would
disappear. This ensures text remains viewable when tabbing to button.
2016-03-07 06:08:43 -05:00
Jordan Wright
d04c562d7e Updated API for release 0.1.2 2016-03-03 20:44:11 -06:00
Jordan Wright
1ded863487 Merge pull request #190 from gophish/187-datatables-style-fix
Fixing DataTables Styling
2016-03-03 20:22:10 -06:00
Jordan Wright
625f4f8dc0 Ignoring error for no sending profile found. Fixes #189 2016-03-03 18:47:10 -06:00
Justin Gray
a3b89472e0 Added hotfix for issues, closes #187. There could be a better way to do this. 2016-03-02 22:52:29 -06:00
Jordan Wright
0741e163f5 Merge pull request #186 from rcutmore/confirm-password
Confirm password on registration or change
2016-03-02 19:25:30 -06:00
Rob Cutmore
a5a7b23479 Use more descriptive variable names in auth.go 2016-03-02 19:59:40 -05:00
Jordan Wright
e3f1b163fc Fixed duplicate attachments. Fixes #185 2016-03-02 08:44:37 -06:00
Rob Cutmore
e39ae8dfdd Confirm password on registration or change
Updated to confirm password when registering user or changing a
user's password.

Fixes #180
2016-03-02 08:33:27 -05:00
Jordan Wright
9485ea2ecd Removing unneeded bootstrap backup file. 2016-02-29 21:44:52 -06:00
Jordan Wright
f3a3a6e79a Fixed trimmed logo on mobile devices. Fixes #82 2016-02-29 21:40:36 -06:00
Jordan Wright
76962749b1 Moved "Add Tracking Image" changes to the copy() function 2016-02-29 21:30:20 -06:00
Jordan Wright
78f378fc28 Added better handling of the "Include Tracking Image" option 2016-02-29 21:20:46 -06:00
Jordan Wright
8a3f990d1f Updated User Guide 2016-02-28 23:22:27 -06:00
Jordan Wright
af91483cd4 Merge pull request #169 from gophish/78-store-smtp-settings
Added storage of SMTP settings to database. Closes #78
2016-02-28 22:16:30 -06:00
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
William Woodson
5afaea8d6d Remove attempt to migrate from existing SMTP since it is unsafe in multi user environments and confusing + breaks relationships when entries are de-duped. 2016-02-27 21:24:24 -06:00
William Woodson
7d52c8a7ab Update campaign copy function to work with saved SMTP data 2016-02-27 21:13:35 -06:00
William Woodson
abec9adfba Return an SMTP object via GET /campaigns 2016-02-27 21:12:18 -06:00
William Woodson
c066fa9d52 Merge branch '78-store-smtp-settings' of github.com:gophish/gophish into 78-store-smtp-settings 2016-02-27 21:03:13 -06:00
Jordan Wright
49e575cf56 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
William Woodson
cc241ea67e Merge remote-tracking branch 'origin/160-clone-campaigns' into 78-store-smtp-settings 2016-02-27 20:08:02 -06:00
William Woodson
56c9ea070b Fixed isses with SMTP table migration: better names on created objects, all SMTP records are imported with appropriate user_id, entries are de-duped based on user_id:host:from_address tuple 2016-02-27 19:38:54 -06:00
William Woodson
7ca63f55be gofmt, because that is a thing 2016-02-27 08:37:02 -06:00
William Woodson
f1d1d6838b Updated js on sending_profiles page to work with updated /util/send_test_email 2016-02-27 08:34:33 -06:00
William Woodson
80fc04924d Added handling to /util/send_test_email to use default on empty template and accept a validated SMTP object from send test email workflow on sending profiles page 2016-02-27 08:32:10 -06:00
Jordan Wright
4810222404 Merge branch '124-capture-passwords' 2016-02-25 20:04:48 -06:00
Jordan Wright
b0dd96d088 Merge branch 'master' into 124-capture-passwords 2016-02-25 20:02:15 -06:00
Jordan Wright
44fa8127fc Adding the ability to capture submitted data via the UI. Fixes #124 2016-02-25 19:58:49 -06:00
Jordan Wright
af76603949 Adding tests 2016-02-25 19:58:02 -06:00
Jordan Wright
89ae56fb94 Merge pull request #174 from gophish/148-polling
Implemented Polling for Campaign Updates
2016-02-24 21:26:32 -06:00
Jordan Wright
79627d5579 Fixed caret not being saved.
Added realtime updates to timeline
2016-02-24 17:48:54 -06:00
Jordan Wright
0c72e8b69a Added updating of datamaps with new bubbles 2016-02-23 18:50:07 -06:00
Jordan Wright
95fb02bade Cleaning up some logic on updating the email chart legend. 2016-02-23 11:51:43 -06:00
Jordan Wright
53e5508bca Upgrading Datatables 2016-02-22 22:40:33 -06:00
William Woodson
ffb14b7927 Created default email template and landing page passed for _send_test_email_ in sending profile page 2016-02-22 22:27:23 -06:00
William Woodson
e889052a90 Merge branch '78-store-smtp-settings' of github.com:gophish/gophish into 78-store-smtp-settings 2016-02-22 21:38:56 -06:00
William Woodson
3e69a4f4e8 Update 20160221001538_0.1.2_store-smtp-settings.sql
Makes more sense to use campaigns.id in this select
2016-02-22 20:11:02 -06:00
William Woodson
a3376a702f Working on send test email in sending_profiles page 2016-02-22 06:25:29 -06:00
William Woodson
a2ee229848 More cleaning up artifacts in modals on edit/copy/new for #143 2016-02-22 05:57:03 -06:00
Jordan Wright
553ead7d68 Moved fmt prints to Logger prints 2016-02-21 22:18:34 -06:00
Jordan Wright
78203ad208 Added tests for SMTP 2016-02-21 22:13:06 -06:00
Jordan Wright
d1de466cc9 Validating on PUT
Added check for parsing the FromAddress on Validate()
2016-02-21 22:12:47 -06:00
Jordan Wright
7bf2c00356 gofmt'ing 2016-02-21 21:09:14 -06:00
Jordan Wright
f7b63adfbb Added basic polling updates for the charts. Made the call to get campaign results be async. 2016-02-21 20:55:27 -06:00
William Woodson
9c7adb9941 Cleaning up artifacts in modals on edit/copy/new for #143 2016-02-21 17:00:37 -06:00