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

303 Commits (4c04bd02c69cfd8c50850d44872890608b192c16)

Author SHA1 Message Date
Sami Mokaddem 4c04bd02c6 Merge branch 'doc' 2017-12-04 15:16:52 +01:00
Alexandre Dulaunoy fd82ef8a2c
Merge pull request #15 from mokaddem/redisBuffer 
Redis buffering and bugfixes
 2017-12-04 14:57:58 +01:00
Sami Mokaddem 92ccd8517e update: start_all.sh 2017-12-04 14:36:30 +01:00
Sami Mokaddem 25f50fb8df update: updated readme 2017-12-04 14:01:06 +01:00
Sami Mokaddem e0c4c0a50b Added zmq_subscriber between ZMQ and Redis 2017-12-04 12:06:04 +01:00
Sami Mokaddem 43c4895d3b UI: Reduced size of panel so that it does not overflow in the page. 
Changed PB offset from padding to top, reducing overing bug/flickering.
Reduced badges size so that the modal fit in the page.
 2017-12-04 11:49:30 +01:00
Sami Mokaddem 7532074417 Refacto: removed useless args and vars 2017-12-04 11:14:25 +01:00
Sami Mokaddem 876146e06a Merge remote-tracking branch 'upstream/master' into redisBuffer 2017-12-04 10:59:53 +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 e4d933a55b refacto: rmoved prints and added return in case phone number can't be 
parsed
 2017-12-01 15:52:50 +01:00
Sami Mokaddem b1bbb8efc3 fix: parsing into float instead of int 2017-12-01 15:49:20 +01:00
Sami Mokaddem 849d8cc8eb fix: Fixed tons of bugs related to migration of handle_contribution to 
controbutor_helper
 2017-12-01 15:39:17 +01:00
Sami Mokaddem 17315f6c74 fix: Added keyname in configuration 2017-12-01 15:09:26 +01:00
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
Sami Mokaddem 868ba9f80b fix: redis buffer seems to work 2017-11-30 16:04:03 +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
Sami Mokaddem 850b686e76 Added draft of redis buffer 2017-11-30 08:17:53 +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 14a45f4ff4 typo: fixed path message passing pic 2017-11-29 09:59:48 +01:00
Sami Mokaddem e6f7b76f00 update: from 1 table to multiple one per category + updated message 
passing schema to show redis list
 2017-11-29 09:46:28 +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 fa0aebd81e update: updated database table 2017-11-27 14:49:42 +01:00
Sami Mokaddem 0d53091fd3 content: started message passing + database 2017-11-27 14:44:32 +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