MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity
226 Commits
8 Branches
5 Tags
9.6 MiB
Commit Graph

226 Commits (95faae3fd22fe2e969ae9e98801000fe08347623)

Author SHA1 Message Date
Sami Mokaddem 95faae3fd2 Merge branch 'users' into trendings 2017-11-17 16:52:07 +01:00
Sami Mokaddem 57abda40c7 fix: use nowSec instead of the undefiend timestamp 2017-11-17 16:51:44 +01:00
Sami Mokaddem b17d480360 feature: Added draft support of discussion in Trendings 2017-11-17 16:50:04 +01:00
Sami Mokaddem 7ebeed6012 refacto: Indenting 2017-11-17 16:14:39 +01:00
Sami Mokaddem 8e398bbabc Merge branch 'users' into trendings 2017-11-17 16:13:51 +01:00
Sami Mokaddem 98deecbf31 Merge branch 'skill_trophies' into users 2017-11-17 16:13:04 +01:00
Sami Mokaddem 85aee0dd9a feature: Added legend in pie chart 2017-11-17 16:12:56 +01:00
Sami Mokaddem f7df04b9bf Merge branch 'users' into trendings 2017-11-17 16:06:36 +01:00
Sami Mokaddem afef7ed420 update: add a user_login at each contribution (Usefull to compute 
contrib/login).
 2017-11-17 16:05:00 +01:00
Sami Mokaddem 95ff2590e9 Added link in other pages 2017-11-17 15:58:21 +01:00
Sami Mokaddem ec3a6811ee UI: update 2017-11-17 15:57:50 +01:00
Sami Mokaddem b5a844dab8 fix: do not json dumps string into redis (avoiding escaping) 2017-11-17 15:32:47 +01:00
Sami Mokaddem 837c0e7a6d Merge branch 'skill_trophies' into trendings 2017-11-17 15:13:51 +01:00
Sami Mokaddem b39bc716ee fix: Trophy number overflow. Corrected by adding a threshold 2017-11-17 15:13:21 +01:00
Sami Mokaddem 415f696953 fix: Trophy number overflow. Corrected by adding a threshold 2017-11-17 14:56:35 +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 074998c227 UI: update 2017-11-17 11:57:32 +01:00
Sami Mokaddem 50fa7df1ac Merge branch 'users' into trendings 2017-11-17 11:48:14 +01:00
Sami Mokaddem 1da5cc61ea update: consider only one login of user per hour 2017-11-17 11:47:20 +01:00
Sami Mokaddem bacde8e71f feature: Draft of sightings support 2017-11-17 11:46:51 +01:00
Sami Mokaddem ec3ec66fa7 UI: Added margin for items in legends 2017-11-17 10:46:25 +01:00
Sami Mokaddem 3d1d4c29ca Support of hover in pie and line charts 2017-11-17 10:41:22 +01:00
Sami Mokaddem bd988a74a8 Merge branch 'users' into trendings 2017-11-17 10:07:51 +01:00
Sami Mokaddem 3c230428a9 Finally added trending_helper script... 2017-11-17 10:07:24 +01:00
Sami Mokaddem 445c56b07f Changed plotting behavior of punchcard 2017-11-17 10:06:43 +01:00
Sami Mokaddem 1ca3c7aeba Merge branch 'users' into trendings 2017-11-17 09:57:48 +01:00
Sami Mokaddem 1ca2a48262 Fix: fixed bug displaying data from another source 2017-11-17 09:57:29 +01:00
Sami Mokaddem e57018c799 Better display on linechart 2017-11-17 09:43:59 +01:00
Sami Mokaddem b53f9fdf4b Feature: Date range replace fixed date + formatted labels 2017-11-17 09:13:18 +01:00
Sami Mokaddem a5f4306489 Text label with correct format + Linked x overtime (linechart) 2017-11-16 16:57:48 +01:00
Sami Mokaddem 5779eb53c4 Merge branch 'users' into trendings 2017-11-16 15:11:04 +01:00
Sami Mokaddem 8daa9e4364 Fix: setupgrid forgotten + bad contition 2017-11-16 15:10:29 +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 8de58f77f4 Added link in header 2017-11-16 12:01:43 +01:00
Sami Mokaddem fab250cae7 Renamed panel title 2017-11-15 16:00:08 +01:00
Sami Mokaddem 82346e8782 Split js and html 2017-11-15 15:58:16 +01:00
Sami Mokaddem e0d155564f Replaced loginOccurence by contribution/login 2017-11-15 15:40:28 +01:00
Sami Mokaddem 66fe81b064 Added no data display in contribution_after_login 2017-11-15 14:43: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 3ec4bcb7a4 Fixed keyError new categ 2017-11-14 17:02:51 +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 f22aaee21d Draft support of trophies in ZMQ 2017-11-14 14:05:54 +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