Commit Graph

100 Commits (55649570bdf2f9d32b868fe99289794a61a75a2e)

Author SHA1 Message Date
Steve Clement a6c4f2928d - Fixed the brokeness of: - echo export DASH_CONFIG=$(pwd)/config/ >> ./DASHENV/bin/activate
-- This is mostly wrong for people not running misp-dashboard interactively.
-- It also assumes people use DASHEN as their virtualenv name (One more issue along those lines remain, $DASH_HOME)
2018-03-31 19:21:52 +09:00
A. Cristallo 5da749cc2a
Simply Python3
With header /usr/bin/env python3.5 doesn't run with the last python3 (3.6), so imho it's better not specify the subversion (.5, .6 and so on), simply leaving "python3".

Tested with Python 3.6.3 onVM "Linux misp" (Ubuntu kernel 4.13 x64)
2018-03-14 17:08:45 +01:00
Sami Mokaddem 3ae2882e97 feature: Added a tooltip in trendings' timeline + open a MISP tab on double click 2018-01-16 09:28:16 +01:00
Sami Mokaddem 2cc957c87e Merge remote-tracking branch 'upstream/master' into multipleMerges 2018-01-15 14:19:44 +01:00
Sami Mokaddem 5134aac355 Merge remote-tracking branch 'upstream/master' into modules 2017-12-13 09:08:43 +01:00
Steffen Sauler 165efc4751
Taking server host and port from config 2017-12-12 13:43:12 +01:00
Sami Mokaddem a47ec1da52 update: Support of tags in timeline + UI stylizing 2017-12-11 14:54:22 +01:00
Sami Mokaddem 5de0d31818 feature: Added draft of timeline which shows event overtime. The event
currently span consecutive days (if it has been seen).
2017-12-11 12:19:11 +01:00
Sami Mokaddem 73fb3324d3 feature/refacto: Simplified users_helper script. Added possibility to
get data from particular org (in helper and with typeahead).
/!\ CHANGED DATABASE ORGANISATION
2017-12-05 16:04:28 +01:00
Sami Mokaddem 968757f81b fix: now take correct config fields + Removed useless field in config 2017-12-05 11:04:26 +01:00
Sami Mokaddem 9139ed7eef Added logger in config 2017-12-05 10:23:40 +01:00
Sami Mokaddem bdef0c21e9 Moved helper scripts in their folder + updated import path 2017-12-05 09:56:32 +01:00
Sami Mokaddem b59827591d update: changed some log levels 2017-12-05 09:02:49 +01:00
Sami Mokaddem 1386e58cf8 Started integration of Logging 2017-12-04 16:44:44 +01:00
Sami Mokaddem d8b7734b08 ui: Restrained number of orgs in fame and prevented datatable to go over
the visible screen
2017-12-01 16:02:28 +01:00
Sami Mokaddem 40d19cd4f2 update: Removed non-used var and function 2017-11-27 10:05:28 +01:00
Sami Mokaddem 8446f3de96 Moving geo functions into their own script 2017-11-27 09:47:55 +01:00
Sami Mokaddem 0c057dfe2d Merge branch 'skill_trophies' into trendings 2017-11-24 15:09:58 +01:00
Sami Mokaddem 352d160090 update: Changed trophy rewward system. Deliver trophy to the TOP x% defined in the config file. Also, added more info in the trophy modal 2017-11-24 15:09:34 +01:00
Sami Mokaddem 127c1cef5e feature: Added a selector for the maximum number of showed items 2017-11-21 15:20:07 +01:00
Sami Mokaddem e3a63e863f Merge branch 'users' into trendings 2017-11-21 12:04:10 +01:00
Sami Mokaddem 9daab31535 feature: Added contribution overtime in login overtime chart 2017-11-21 11:59:07 +01:00
Sami Mokaddem 914514023b Added typeahead plot for events 2017-11-21 08:42:54 +01:00
Sami Mokaddem 39d83ebc9b Added typeahead 2017-11-20 17:42:25 +01:00
Sami Mokaddem b17d480360 feature: Added draft support of discussion in Trendings 2017-11-17 16:50:04 +01:00
Sami Mokaddem f55ad8255c fix and feature: Added data ordering in reids (useing orderedDico) +
Added sightings in UI + colored charts woth tag color"
2017-11-17 14:45:20 +01:00
Sami Mokaddem b53f9fdf4b Feature: Date range replace fixed date + formatted labels 2017-11-17 09:13:18 +01:00
Sami Mokaddem 8942a43c18 Added linked pie plot with server 2017-11-16 15:08:14 +01:00
Sami Mokaddem 71837d3308 Added trendings template 2017-11-16 12:23:02 +01:00
Sami Mokaddem e0d155564f Replaced loginOccurence by contribution/login 2017-11-15 15:40:28 +01:00
Sami Mokaddem 05c7c7a453 Linked contribution_and_login to server 2017-11-15 14:34:37 +01:00
Sami Mokaddem b913f86e7b Linked MISP - Users with server (nto done for API usage yet) 2017-11-15 13:45:01 +01:00
Sami Mokaddem c1105aba73 Added login overtime + users_helper script 2017-11-15 09:36:44 +01:00
Sami Mokaddem 2f74406f64 Draft MISP-Users 2017-11-14 17:03:46 +01:00
Sami Mokaddem 2b3a5be907 Start of linking fame quality 2017-11-14 15:44:53 +01:00
Sami Mokaddem 8eae00f6b5 Fixed bug json parsing in server + continuation of trophy support in zmq 2017-11-14 14:56:15 +01:00
Sami Mokaddem c13e39d5a6 added latestAwards + started trophy ranks 2017-11-14 09:50:20 +01:00
Sami Mokaddem 70561357c3 Draft eventSource lastAwards 2017-11-13 16:26:09 +01:00
Sami Mokaddem c35fbe969b Started new contrib layout (latest awards + 2 fames tabs) + fixed bug searching org (caused by the switch to link) 2017-11-13 16:02:09 +01:00
Sami Mokaddem 0bc0683924 Started support of organisation trophies 2017-11-13 12:57:05 +01:00
Sami Mokaddem cc766d7b04 Updated non-test function + minor UI fix 2017-11-09 10:58:18 +01:00
Sami Mokaddem 97a9020716 Added draft support of org overtime + Added clickable orgName + minor fix in live dashbaord + draft support of sighting in zmq_sub 2017-11-09 10:32:39 +01:00
Sami Mokaddem 605538ce97 Added display of conribution rank statys + acquired badges 2017-11-08 15:34:02 +01:00
Sami Mokaddem 90a518cc07 Added support of honorBadge + Added text related to global ranking requirements 2017-11-08 11:29:07 +01:00
Sami Mokaddem 41b4bee917 Added organisation global ranking dipslay 2017-11-07 12:54:08 +01:00
Sami Mokaddem 50a1a349da Updated test data + increased rank icon size 2017-11-06 18:07:10 +01:00
Sami Mokaddem 0811823112 Added help text in contribution board 2017-11-06 17:14:10 +01:00
Sami Mokaddem 79cf989512 Added contribution page auto-reload 2017-11-06 15:00:51 +01:00
Sami Mokaddem cba6d260ff Added draft of automatic update for lastContributor 2017-11-06 13:43:55 +01:00
Sami Mokaddem 29e08d8592 Separeted contributor functions from server script 2017-11-06 10:42:51 +01:00