Commit Graph

19 Commits (dbc407676e22f5ab1124a686b8b433ff4312038f)

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 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
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 a6748a7d5f Added "Add Tracking Image" checkbox to template modal 2016-01-13 22:42:16 -06:00
Jordan Wright b574fb2741 Implemented campaign.URL. Fixed #32
Implemented {{.From}}. Fixed #36
2015-10-22 19:54:01 -05:00
Jordan Wright 9a13eef518 Tweaked Modal Fading Interaction (Open/Close actions) 2015-09-15 20:39:33 -05:00
Jordan Wright b45a72618d Adding the ability to import emails - WIP 2015-09-14 23:42:29 -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
unknown ba43e683c2 Added ability to delete templates 2015-08-14 18:27:04 -05:00
unknown d79de6263d Updated templates page to handle PUT vs POST - can now edit templates 2015-08-14 18:24:02 -05:00
unknown a2252c1b5b UI fixes
working on campaign results page
2015-07-07 22:31:21 -05:00
unknown 4685b36928 Updated font-awesome to 4.3.0
Added buttons for editing/viewing/deleting objects in the tables (actual functionality to follow)
2015-07-06 22:26:08 -05:00
unknown 1d0636daab Can now create templates (working on edit functionality for all of these) 2015-06-29 19:33:11 -05:00
unknown 62323c170e Fixed csv upload on user import
Added moment.js for date formatting
UI Tweaks on pagination
Attachments are now a datatable (table all the things)
2015-06-27 19:21:46 -05:00
unknown 62fc7b2d97 Made progress handling adding attachments to templates 2015-06-25 02:53:03 -05:00
unknown ca378f835f UI fixes
Got submitting groups working
Fixed CKEditor integration on templates
2015-06-23 23:02:29 -05:00