cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
642 Commits
25 Branches
17 Tags
118 MiB
Commit Graph

642 Commits (af293da9f5e4eb2082894aa2eddbe20c8c39794c)

Author SHA1 Message Date
Jordan Wright 4a438e4ad1 Merge pull request #91 from StrangeUSB/master 
Adding Back Button to Campaign Results
 2016-01-20 23:40:43 -06:00
Justin Gray a2aa884c8e Changed button to anchor 
Changed button to anchor tag.
 2016-01-20 23:37:49 -06:00
Justin Gray 0b803ac6d7 Adding Back Button on Campaign Results Page 
Added back button on campaign results page.
 2016-01-20 22:31:39 -06:00
Justin Gray cf97520ddf Merge pull request #1 from gophish/master 
Catching up to the main branch from gophish/master
 2016-01-20 22:27:58 -06:00
Jordan Wright 080b3a6c27 Merge branch 'table-style' of https://github.com/StrangeUSB/gophish into StrangeUSB-table-style 
# Conflicts:
#	static/js/app/campaigns.js
#	static/js/app/dashboard.js
#	static/js/app/landing_pages.js
#	static/js/app/templates.js
#	static/js/app/users.js
 2016-01-20 21:53:12 -06:00
Jordan Wright ca38f336a0 Merge pull request #88 from gophish/55-database-migrations 
Adding first round of database migrations using goose. Fixes #55
 2016-01-20 20:56:03 -06:00
Justin Gray 964ce6f152 Fixed Double Instantiation 
When a modal was closed and the data was loaded again it tried to
instantiate the table again, so always destroy the table on load.
 2016-01-20 20:35:51 -06:00
Justin Gray 0bdc4a751d Remove unnecessary code 
Removed check and just always destroy and rebuild datatables.
 2016-01-20 20:33:59 -06:00
Justin Gray 22c2f659e8 Fixed the attachments table 
Fixed the sorting on the attachments table, there could be opportunity
to clean this up a little.
 2016-01-20 19:42:41 -06:00
Jordan Wright 92e3d2a4fd Merge pull request #86 from gophish/81-campaign-launch-button 
Changed button on campaign to say "Launch Campaign". Fixes #81
 2016-01-20 19:04:35 -06:00
Jordan Wright 52e5c60511 Changed button on campaign to say "Launch Campaign" - minor formatting fixes. 2016-01-20 19:00:32 -06:00
Jordan Wright b4379512f7 Merge pull request #85 from gophish/34-csv-export 
Added ability to export as CSV. Fixes #34
 2016-01-20 18:51:27 -06:00
Jordan Wright 655faaf72b Added ability to export as CSV. Fixes #34 2016-01-20 18:45:53 -06:00
Jordan Wright 379edf73a3 Adding first round of database migrations using goose 2016-01-18 21:13:32 -06:00
Jordan Wright 1b5fb638ea Fixed new campaign redirect 2016-01-18 11:53:27 -06:00
Jordan Wright ac368e1046 Fixing tooltips on campaign results table 2016-01-17 22:20:38 -06:00
Jordan Wright 064b56855c Merge pull request #75 from wjwoodson/enable-server-tls 
Added UseTLS config option for both Admin and Phish servers
 2016-01-17 21:50:01 -06:00
Justin Gray b9fd654f8a Added no-sort options to tables 
Added a no-sort class to column headers where sorting doesn’t make
sense.  Still have the attachments table in the templates page to do,
there was something strange happening.
 2016-01-17 15:27:11 -06:00
Justin Gray 2ff2cbd1ca Changed Sortable Icon Color 
Changed the color of the sortable icon back to the initial color.  Adds
a little more contrast to the enabled icon.
 2016-01-17 14:37:18 -06:00
William Woodson 8d0d401635 Merge pull request #1 from wjwoodson/ui-fixes 
UI fixes to dashboard, campaign, and campaign_result views. fixes #76
 2016-01-17 13:26:34 -06:00
William Woodson fa5a5c65af fix dumb things in last commit 2016-01-17 13:25:13 -06:00
William Woodson 45ac3db452 Merge branch 'ui-fixes' of github.com:wjwoodson/gophish into ui-fixes 2016-01-17 13:21:47 -06:00
William Woodson e6a9848c20 UI fixes to dashboard, campaign, and campaign_result views. fixes #76 2016-01-17 13:21:06 -06:00
William Woodson 3eef2905c8 UI fixes to dashboard, campaign, and campaign_result views. fixes #76 2016-01-17 13:15:32 -06:00
William Woodson 44852546e0 Added UseTLS config option for both Admin and Phish servers 2016-01-17 10:45:13 -06:00
Justin Gray 84d21ab655 Sample Table Style 
Changed the style of the add/manage users table.
 2016-01-17 01:31:46 -06:00
Jordan Wright 1d8ac6f9f3 Added better logging for campaign retrieval 2016-01-16 23:51:01 -06:00
Jordan Wright 3ae09be989 Final fix for campaign deletion 2016-01-16 23:50:32 -06:00
Jordan Wright cff666119e Added ability to delete campaign. Fixes #72 2016-01-16 23:50:11 -06:00
Jordan Wright 66720aa1b8 Added GoDoc reference as well as website link 2016-01-16 23:01:53 -06:00
Jordan Wright 2dda83814c Formatting Javascript using js-beautifier 2016-01-16 22:59:40 -06:00
Jordan Wright e78ec27ef2 Adding package documentation for util and worker packages 2016-01-16 22:34:02 -06:00
Jordan Wright 65005a2805 Moved modal closing to hide.bs.modal - Fixes #71 2016-01-16 19:24:13 -06:00
Jordan Wright 86e0255ae6 Adding event for each email that's sent - can keep track of each target better this way. 2016-01-14 22:50:09 -06:00
Jordan Wright 89e72dd78d Added error handling on startup of web servers. Fixes #70 2016-01-14 22:46:43 -06:00
Jordan Wright 0d57a78b74 Adding first draft of CONTRIBUTING file and CLA. Fixes #57 2016-01-13 23:05:17 -06:00
Jordan Wright a6748a7d5f Added "Add Tracking Image" checkbox to template modal 2016-01-13 22:42:16 -06:00
Jordan Wright 7c9e5195f5 Fixed inverted tooltip toggle issue 2016-01-13 22:41:39 -06:00
Jordan Wright e29e3335c5 Fix CSS Navbar Bug to Collapse Sooner 2016-01-13 21:06:29 -06:00
Jordan Wright 25a7a32003 Added test for #60 2016-01-12 20:52:13 -06:00
Jordan Wright fc6d556742 Caused API key to be generated dynamically for admin user. Fixes #60 2016-01-12 20:46:17 -06:00
Jordan Wright b3fe840999 Updated README 2016-01-12 18:50:52 -06:00
Jordan Wright 1081258c02 Fixing dependencies 2016-01-11 22:46:48 -06:00
Jordan Wright 38082f0498 Merge branch 'master' of https://github.com/gophish/gophish 
Resolved conflicts in templates/docs.html
 2016-01-11 22:30:27 -06:00
Jordan Wright 6ffbb7b5f8 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
Jordan Wright 70e24f4d8c Merge pull request #64 from wjwoodson/fixing-dependencies 
Moving dependencies to new gophish repo.
 2016-01-10 23:20:09 -06:00
William Woodson 17a186c002 fixing merge conflicts 2016-01-10 19:37:34 -06:00
William Woodson 45ee686629 resolve merge conflicts 2016-01-10 19:35:26 -06:00
William Woodson 4ecaf8d830 resolve merge conflicts 2016-01-10 19:27:06 -06:00
Jordan Wright 737f41e5c6 Updated bcrypt dependency - fixes #63 2016-01-10 14:54:59 -06:00