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

332 Commits (766a42cf7c11ab084ac46f52c160588c00205e49)

Author SHA1 Message Date
Alexandre Dulaunoy 766a42cf7c
Merge pull request #24 from mokaddem/usersUpdate 
Update of users module
 2017-12-19 16:59:23 +01:00
Alexandre Dulaunoy dde6362f8b
Merge pull request #23 from mokaddem/updateGeo 
Changed tooltip content in geolocalisation
 2017-12-19 16:58:44 +01:00
mokaddem 9cfaa587fb
Merge pull request #25 from mokaddem/geoFix 
Fix - Geolocalisation
 2017-12-19 09:35:38 +01:00
Sami Mokaddem 763ad16fec fix: tries to get coordinate from ISO_CODE if 'location' is not in the geoip.database response 2017-12-19 09:32:28 +01:00
Alexandre Dulaunoy c25e4f1718
Merge pull request #22 from SHSauler/patch-3 
Fix: Freeze issue
 2017-12-18 20:28:38 +01:00
Steffen Sauler d3041abc39
Fix: remove redundant threads definition 2017-12-18 15:29:08 +01:00
Steffen Sauler 7ee1d12902
Fix: Freeze issue 2017-12-18 15:20:37 +01:00
Alexandre Dulaunoy 609d9c8780
Merge pull request #20 from SHSauler/patch-2 
Prod deployment with mod_wsgi
 2017-12-16 09:48:59 +01:00
Alexandre Dulaunoy 34451efc04
Merge pull request #16 from mokaddem/modules 
Logger
 2017-12-16 09:40:12 +01:00
Steffen Sauler fcdc520273
Fix: deploy header level 2017-12-15 16:16:39 +01:00
Steffen Sauler 9d0406df26
Added: Deploy in production using mod_wsgi 2017-12-15 16:15:01 +01:00
Steffen Sauler 12b078a2e9
wsgi definition for Apache mod_wsgi 2017-12-15 16:05:25 +01:00
Sami Mokaddem 5134aac355 Merge remote-tracking branch 'upstream/master' into modules 2017-12-13 09:08:43 +01:00
mokaddem 5050a6927f
Merge pull request #18 from SHSauler/master 
server hostname and port into config file
 2017-12-12 16:52:37 +01:00
Steffen Sauler b4f0aeb3af
Fix: config default port back to 9001 2017-12-12 16:48:54 +01:00
Steffen Sauler fb9e49a612
Adding default server fields 2017-12-12 13:43:51 +01:00
Steffen Sauler 165efc4751
Taking server host and port from config 2017-12-12 13:43:12 +01:00
Sami Mokaddem d8d9d5a145 fix: getDates was omitting dates 2017-12-07 09:17:22 +01:00
Sami Mokaddem bb3ccf2815 fix: contribution is correctly taken for the entire time span instead of just one day if no org is specified 2017-12-06 16:51:29 +01:00
Sami Mokaddem a38b2f7383 update: Replaced content of pop in TopCoordinates. Instead of [lat, long], shows [categ, value] of the concerned attribute 2017-12-06 11:49:41 +01:00
Sami Mokaddem a52bf6ced5 update: Clear separation between login and contribution to have 
meaningful query and contribution/login score.
 2017-12-05 16:31:08 +01:00
Sami Mokaddem 2e74c418fb update: database organisation in doc 2017-12-05 16:28:58 +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 2034941d64 Append to log instead of replacing 2017-12-05 10:32:12 +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 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