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

322 Commits (c25e4f1718701fde247370ffa49d8c05891855f4)

Author SHA1 Message Date
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 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
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