Commit Graph

18 Commits (c2bfac279408eb87c6e7c46a7cb765f1830d9788)

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
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 2dda83814c Formatting Javascript using js-beautifier 2016-01-16 22:59:40 -06:00
Jordan Wright 65005a2805 Moved modal closing to hide.bs.modal - Fixes #71 2016-01-16 19:24:13 -06:00
Jordan Wright 7c9e5195f5 Fixed inverted tooltip toggle issue 2016-01-13 22:41:39 -06: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
unknown a78e92a436 Changed look of donut chart legend
Fixed deleteCampaign tooltip
Moved Result Status styles to an object
Dashboard, Users,  now has fancy loading gif
Now only loading ckeditor from templates and landing pages templates
Starting to add maps (coming soon!)
2015-08-11 21:12:09 -05:00
unknown eacb4ddfd4 Fixed /users endpoint to now have the following functionality:
- Edit
- Delete
Also added group validation on PUT /api/groups/:id
2015-08-05 00:23:05 -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 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 ca378f835f UI fixes
Got submitting groups working
Fixed CKEditor integration on templates
2015-06-23 23:02:29 -05:00
unknown 1cf017acba Fixed pointer css 2015-06-19 13:53:47 -05:00
unknown 33f240bfe0 Working on group editing 2015-06-17 22:44:05 -05:00
unknown 20b1c80454 Fixed tooltip - still cleaning up /users 2015-06-16 23:23:02 -05:00
unknown cf8c8c4534 Cleaned up sidebar nav links
Moved JS api structure to api.*.get(), etc.
Working on /groups now
2015-06-16 23:09:27 -05:00