Commit Graph

10 Commits (a2aa884c8e69e6413ef5d8e5ce10cd912e2b6022)

Author SHA1 Message Date
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
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 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
Jordan Wright 2dda83814c Formatting Javascript using js-beautifier 2016-01-16 22:59:40 -06:00
Jordan Wright 8141393480 Fixed page editing. Fixes #44 2015-10-23 18:35:42 -05:00
Jordan Wright 9a13eef518 Tweaked Modal Fading Interaction (Open/Close actions) 2015-09-15 20:39:33 -05:00
Jordan Wright f51758f8c9 Fixed issue where links and other attributes could not be edited in CKEditor 2015-08-25 22:07:57 -05:00
Jordan Wright ba11f6428c Can now add/delete pages
Fixed test for importing a site - Now actually performs the right test.
2015-08-25 21:03:12 -05:00
Jordan Wright fad36607e4 Importing a site now works fairly well... just need to be able to save the "Landing Page" 2015-08-25 18:56:58 -05:00
Jordan Wright 1ec08d86cf Adding landing page frontend logic - basic page structure at this point 2015-08-23 15:20:28 -05:00