mokaddem
							
						 
						
							 
							
							
							
								
							
								68f158ebed 
								
							
								 
							
						 
						
							
							
								
								fix: [all] Fixed issue with py-redis>2.x and fix failed merge conflict  
							
							 
							
							
							
						 
						
							2019-06-18 11:25:17 +02:00  
						
					 
				
					
						
							
							
								 
								mokaddem
							
						 
						
							 
							
							
							
								
							
								c34d94cf7f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:MISP/misp-dashboard into HEAD  
							
							 
							
							
							
						 
						
							2019-06-14 09:30:26 +02:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								eda2581441 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: [import] Fixed missing import sys  
							
							 
							
							
							
						 
						
							2019-06-01 15:08:48 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								6237566664 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: [import] import sys was missing for proper error handling  
							
							 
							
							
							
						 
						
							2019-06-01 15:03:31 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								1f48d9621c 
								
									
								
							
								 
							
						 
						
							
							
								
								chg: [perms] Check if permissions fail on the MaxMind db files  
							
							 
							
							... 
							
							
							
							chg: [installer] Check if network is present and the first wget worked
chg: [installer] Exit if the virtualenv creation/update fails 
							
						 
						
							2019-05-29 13:15:49 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								a65d2cb233 
								
									
								
							
								 
							
						 
						
							
							
								
								chg: [log] Let the user know which "IP" was not resolved.  
							
							 
							
							
							
						 
						
							2019-05-29 10:58:09 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								92b91c5c05 
								
									
								
							
								 
							
						 
						
							
							
								
								chg: [log] Added 3 seperate log files: helpers.log / zmq_subscribre.log / zmq_dispatcher.log  
							
							 
							
							... 
							
							
							
							fix: [log] Catch permission errors on log files 
							
						 
						
							2019-05-29 10:41:43 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								6b291a5526 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: [geoadd] Catch the following issue:  https://github.com/MISP/misp-dashboard/issues/70  
							
							 
							
							
							
						 
						
							2019-05-29 09:58:09 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								e74b4a5bff 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: [isort] isort source files:  https://github.com/timothycrosley/isort/wiki/isort-Plugins  
							
							 
							
							
							
						 
						
							2019-05-29 08:42:39 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
								
								
							
							
								
							
								9d4cdd7e16 
								
									
								
							
								 
							
						 
						
							
							
								
								chg: [sort] isort on source files  
							
							 
							
							... 
							
							
							
							fix: [typo] fix retreive to retrieve 
							
						 
						
							2019-05-29 08:30:57 +09:00  
						
					 
				
					
						
							
							
								 
								mokaddem
							
						 
						
							 
							
							
							
								
							
								b207338501 
								
							
								 
							
						 
						
							
							
								
								new: [dispatcher/livelog] Added support of ObjectAttributes  
							
							 
							
							
							
						 
						
							2019-02-22 15:16:50 +01:00  
						
					 
				
					
						
							
							
								 
								mokaddem
							
						 
						
							 
							
							
							
								
							
								97a9465915 
								
							
								 
							
						 
						
							
							
								
								new+chg: [livelog] Added basic filtering capabilities and fullscreen mode  
							
							 
							
							... 
							
							
							
							Also, Improved table, reconnection mechanism and UI 
							
						 
						
							2019-02-22 10:41:54 +01:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								b76a9cd082 
								
							
								 
							
						 
						
							
							
								
								fix: [userLogin] Do not consider all login as login from the SYSTEM  
							
							 
							
							... 
							
							
							
							ADMIN anymore
Due to the change in the misp-zmq, `misp_json_user` only contain the
information that a user has logged in, the user always being the same.
The code now records user logins from the audit channel `misp_json_audit`. 
							
						 
						
							2018-10-01 13:28:27 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								a2a3bd65b6 
								
							
								 
							
						 
						
							
							
								
								fix: Added missing file  
							
							 
							
							
							
						 
						
							2018-09-29 21:57:29 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								bb2ea839f3 
								
							
								 
							
						 
						
							
							
								
								new: [live] support of few historical data to prefill the live dashboard + some bug fixes  
							
							 
							
							
							
						 
						
							2018-09-27 09:38:39 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								dc8a944b23 
								
							
								 
							
						 
						
							
							
								
								Improve trophy ranking algorithm, improved ui, added trophy leaderboard per category  
							
							 
							
							
							
						 
						
							2018-09-25 14:48:13 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								f92dd11f7f 
								
							
								 
							
						 
						
							
							
								
								chg+fix: [trending/flask] applied algorithm strategy for other stats + FIXED eventsource caching bug:  
							
							 
							
							... 
							
							
							
							Data was cached and delivered all at once when reconnecting to the source 
							
						 
						
							2018-09-24 10:26:15 +02:00  
						
					 
				
					
						
							
							
								 
								AIL
							
						 
						
							 
							
							
							
								
							
								a7065c1171 
								
							
								 
							
						 
						
							
							
								
								new: [trending] Better algorithm to detect trending item  
							
							 
							
							
							
						 
						
							2018-09-24 09:21:02 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								c4c2555739 
								
							
								 
							
						 
						
							
							
								
								fix: reverse matching condition  
							
							 
							
							
							
						 
						
							2018-05-09 13:31:49 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								55649570bd 
								
							
								 
							
						 
						
							
							
								
								fix: use float instead of int  
							
							 
							
							
							
						 
						
							2018-05-09 13:04:42 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								eafc61e058 
								
							
								 
							
						 
						
							
							
								
								fix: solve comparing int and string  
							
							 
							
							
							
						 
						
							2018-05-09 12:59:03 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								f2c91c14e6 
								
							
								 
							
						 
						
							
							
								
								fix: typo  
							
							 
							
							
							
						 
						
							2018-05-09 11:57:31 +02:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								2ff3eabc47 
								
							
								 
							
						 
						
							
							
								
								fix: [GeoHelper] fix invalid coordinate  
							
							 
							
							... 
							
							
							
							In some cases, the coordinate given to redis may not match EPSG:900913 /
EPSG:3785 / OSGEO:41001, throwing an error. This fix adds a check and
skip the addition if it occurs 
							
						 
						
							2018-05-09 11:25:50 +02:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
							
								
							
								4924da6ce5 
								
							
								 
							
						 
						
							
							
								
								- config directory is one up.  
							
							 
							
							
							
						 
						
							2018-03-31 19:43:50 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
							
								
							
								1d57ce4525 
								
							
								 
							
						 
						
							
							
								
								- Another typo, closing parenthesis  
							
							 
							
							
							
						 
						
							2018-03-31 19:40:03 +09:00  
						
					 
				
					
						
							
							
								
									
								
								Steve Clement 
							
						 
						
							 
							
							
							
								
							
								a6c4f2928d 
								
							
								 
							
						 
						
							
							
								
								- Fixed the brokeness of: -    echo export DASH_CONFIG=$(pwd)/config/ >> ./DASHENV/bin/activate  
							
							 
							
							... 
							
							
							
							-- This is mostly wrong for people not running misp-dashboard interactively.
-- It also assumes people use DASHEN as their virtualenv name (One more issue along those lines remain, $DASH_HOME) 
							
						 
						
							2018-03-31 19:21:52 +09:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								2cc957c87e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into multipleMerges  
							
							 
							
							
							
						 
						
							2018-01-15 14:19:44 +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  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								89b46eba70 
								
							
								 
							
						 
						
							
							
								
								Added timeline for category  
							
							 
							
							
							
						 
						
							2017-12-18 15:31:22 +01:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								eec59473d6 
								
							
								 
							
						 
						
							
							
								
								fix: was setting time span of elements the day before instead of the  
							
							 
							
							... 
							
							
							
							real one.
update: set window size of timeline to cover the selected dates. 
							
						 
						
							2017-12-11 15:42:25 +01:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								a47ec1da52 
								
							
								 
							
						 
						
							
							
								
								update: Support of tags in timeline + UI stylizing  
							
							 
							
							
							
						 
						
							2017-12-11 14:54:22 +01:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								f2666ef767 
								
							
								 
							
						 
						
							
							
								
								update: Added grouping of elements in the timeline. It allows to see  
							
							 
							
							... 
							
							
							
							more easily of an element appeared multiple times. 
							
						 
						
							2017-12-11 14:21:33 +01:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								5de0d31818 
								
							
								 
							
						 
						
							
							
								
								feature: Added draft of timeline which shows event overtime. The event  
							
							 
							
							... 
							
							
							
							currently span consecutive days (if it has been seen). 
							
						 
						
							2017-12-11 12:19:11 +01:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								2c3f17c4a9 
								
							
								 
							
						 
						
							
							
								
								fix: return datetime instead of timestamp (to stay consistent)  
							
							 
							
							
							
						 
						
							2017-12-07 13:03:52 +01:00  
						
					 
				
					
						
							
							
								 
								Sami Mokaddem
							
						 
						
							 
							
							
							
								
							
								15e199d86c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'usersUpdate' into testScripts  
							
							 
							
							
							
						 
						
							2017-12-07 10:10:27 +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
							
						 
						
							 
							
							
							
								
							
								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
							
						 
						
							 
							
							
							
								
							
								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