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

216 Commits (58185d26520a5ab2304ac4d275805d4aa3aab4b1)

Author SHA1 Message Date
Sami Mokaddem 58185d2652 Merge branch 'master' into users 2017-11-30 08:24:23 +01:00
mokaddem 4ecbd0e363
Update config.cfg.default 
Added ```channelLastAwards``` in the config file
 2017-11-30 08:21:18 +01:00
Alexandre Dulaunoy 5a47e3bd86
Merge pull request #7 from mokaddem/skill_trophies 
MISP Gamification - Addition of skill trophies and badges
 2017-11-29 19:17:06 +01:00
Sami Mokaddem f5c09c27d8 Added Trophies logo 2017-11-29 10:07:18 +01:00
Sami Mokaddem d7293af2e3 Merge branch 'skill_trophies' into users 2017-11-24 15:09:49 +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 627b4ed5ff Increased difficulty + Added 2 new titles 2017-11-24 11:46:33 +01:00
Sami Mokaddem 7e7f666c71 Merge branch 'skill_trophies' into users 2017-11-21 14:54:40 +01:00
Sami Mokaddem 92435c71c2 ui: update 2017-11-21 14:53:55 +01:00
Sami Mokaddem 9daab31535 feature: Added contribution overtime in login overtime chart 2017-11-21 11:59:07 +01:00
Sami Mokaddem 66a391cdff Merge branch 'skill_trophies' into users 2017-11-21 11:11:13 +01:00
Sami Mokaddem a4655fce49 ui fix: prevent race condition with popover trophy update 2017-11-21 11:08:08 +01:00
Sami Mokaddem ffb7764cc2 Merge branch 'skill_trophies' into users 2017-11-21 09:55:10 +01:00
Sami Mokaddem 49c21b14a1 UI: Better table size + Added true cooldown to reduce number of effects 2017-11-21 09:53:24 +01:00
Sami Mokaddem e4c5cea55a fix: prevent out of bound time span. (Happend because the hole day is 
considered, 24*7 < 7days + remaining hours of the day)
 2017-11-21 09:26:58 +01:00
Sami Mokaddem 57abda40c7 fix: use nowSec instead of the undefiend timestamp 2017-11-17 16:51:44 +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 afef7ed420 update: add a user_login at each contribution (Usefull to compute 
contrib/login).
 2017-11-17 16:05:00 +01:00
Sami Mokaddem b39bc716ee fix: Trophy number overflow. Corrected by adding a threshold 2017-11-17 15:13:21 +01:00
Sami Mokaddem 1da5cc61ea update: consider only one login of user per hour 2017-11-17 11:47:20 +01:00
Sami Mokaddem 445c56b07f Changed plotting behavior of punchcard 2017-11-17 10:06:43 +01:00
Sami Mokaddem 1ca2a48262 Fix: fixed bug displaying data from another source 2017-11-17 09:57:29 +01:00
Sami Mokaddem 8daa9e4364 Fix: setupgrid forgotten + bad contition 2017-11-16 15:10:29 +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
Sami Mokaddem f59aac98d7 Continuation of trophy intergration 2017-11-13 15:19:30 +01:00
Sami Mokaddem 0bc0683924 Started support of organisation trophies 2017-11-13 12:57:05 +01:00
Sami Mokaddem 1b9f9bd452 Merge branch 'master' of github.com:MISP/misp-dashboard 2017-11-13 09:15:32 +01:00
Sami Mokaddem 2b4cae69ad Styling overtake 2017-11-13 09:15:20 +01:00
mokaddem cd46dd3bcf
Update README.md 2017-11-10 16:45:47 +01:00
mokaddem 165b1b5f4f
Update README.md 2017-11-10 16:44:57 +01:00
mokaddem 577eca8819
Update README.md 2017-11-10 16:22:05 +01:00
Sami Mokaddem 2ec8ece70c Added screenshots geo and live 2017-11-10 16:16:38 +01:00
Sami Mokaddem 53f0de57ae Added screenshots contributors 2017-11-10 16:03:41 +01:00
Sami Mokaddem 7905c7ffc0 Merge branch 'contributors' 2017-11-10 15:53:21 +01:00