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

284 Commits (761d8b0a9eaf9501db3a2c6003799be6338bdc74)

Author SHA1 Message Date
Alexandre Dulaunoy 761d8b0a9e
Merge pull request #12 from mokaddem/codeCleanUp 
Code clean up
 2017-11-30 16:59:12 +01:00
Sami Mokaddem 19a34700be Merge remote-tracking branch 'upstream/master' into codeCleanUp 2017-11-30 16:55:33 +01:00
Alexandre Dulaunoy f7f380b8cb
Merge pull request #11 from mokaddem/geoLocationOfPhoneNumbers 
Geo location of phone numbers
 2017-11-30 16:42:16 +01:00
Sami Mokaddem 8cd393de0c Merge remote-tracking branch 'upstream/master' into geoLocationOfPhoneNumbers 2017-11-30 16:31:51 +01:00
Alexandre Dulaunoy 2fd917063d
Merge pull request #10 from mokaddem/movingToMVC 
Separate GEO code from server
 2017-11-30 16:31:20 +01:00
Sami Mokaddem 94a239c98e Merge remote-tracking branch 'upstream/master' into movingToMVC 2017-11-30 16:29:39 +01:00
Alexandre Dulaunoy 8578e81f3d
Merge pull request #9 from mokaddem/trendings 
Trendings
 2017-11-30 16:29:14 +01:00
Sami Mokaddem 037ec3d244 Merge branch 'master' into trendings 2017-11-30 16:10:43 +01:00
Alexandre Dulaunoy f2badf7a1f
Merge pull request #8 from mokaddem/users 
Users
 2017-11-30 15:36:30 +01:00
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 c93859136d fix: correct usage of redis key import 2017-11-29 17:10:27 +01:00
Sami Mokaddem a8e8520b81 refacto deleted useless var 2017-11-29 17:04:11 +01:00
Sami Mokaddem 945fade717 refact2: moved redis keyname in the helper constructor (users_helper). Permit to have 
cleaner code and ease the DB management.
 2017-11-29 16:54:09 +01:00
Sami Mokaddem 16d281b634 refact: moved redis keyname in the helper constructor. Permit to have 
cleaner code and ease the DB management.
 2017-11-29 16:46:45 +01:00
Sami Mokaddem 84f3aa6aa1 fix: Added missing config file in the previous commit 2017-11-29 16:38:25 +01:00
Sami Mokaddem ae4e828beb refact: replaced all try on key by the get function to have a cleaner 
code
 2017-11-29 16:34:02 +01:00
Sami Mokaddem d0c72fe214 refacto: Moved ranking config located in config.cfg into ranking.cfg for better 
control and visualisation.
Moved code handling contribution into the contributor_helper script.
Deleted TEST_* function as not used anymore. Real test function will be
done later in the project.
 2017-11-29 16:09:39 +01:00
Sami Mokaddem f5c09c27d8 Added Trophies logo 2017-11-29 10:07:18 +01:00
Sami Mokaddem 90bdd45a18 feature: Added geolocation of phone numbers 2017-11-27 16:32:02 +01:00
Sami Mokaddem 390e8775db fix: bug due to variable deletion 2017-11-27 16:28:27 +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 f7b277931b ui: Arranged centered trophie in modal + ame contrib/login to 7 days instead of 31 2017-11-24 16:46:46 +01:00
Sami Mokaddem 0c057dfe2d Merge branch 'skill_trophies' into trendings 2017-11-24 15:09:58 +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 158018d19e update: Moved section in readme 
(put install and start in first place)
 2017-11-21 16:47:30 +01:00
Sami Mokaddem 4be72bd138 update: Readme + added screenshots 2017-11-21 16:45:20 +01:00
Sami Mokaddem 81912aa519 fix: wget bug + Added screen, virtualenv and redis dependencies 2017-11-21 16:23:28 +01:00
Sami Mokaddem f3b3365320 typo: fix 2017-11-21 16:08:29 +01:00
Sami Mokaddem 8ce6a8dd66 update: install_script and config 2017-11-21 15:56:27 +01:00
Sami Mokaddem dedd046cc3 UI: Title page contains name of the page 2017-11-21 15:29:56 +01:00
Sami Mokaddem e2fdbefa30 UI: Update lines->fill for linecharts 2017-11-21 15:24:49 +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 dab9a4e400 Merge branch 'skill_trophies' into trendings 2017-11-21 14:54:53 +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 60470a1ade fix: bug when label contain '\n' 2017-11-21 14:49:41 +01:00
Sami Mokaddem bc0d825ce9 ui: update to better fit tags legend 2017-11-21 12:09:17 +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 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 2dca8af051 Merge branch 'skill_trophies' into trendings 2017-11-21 09:55:18 +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 9c593c0ef4 Merge branch 'users' into trendings 2017-11-21 09:29:08 +01:00