Sami Mokaddem
|
fdcc02c77a
|
Merge remote-tracking branch 'upstream/master'
Resyncing with upstream
|
2018-02-22 10:13:04 +01:00 |
Sami Mokaddem
|
de1880a2fc
|
fix: message_passing picture better reflect reality
|
2018-02-21 18:24:40 +01:00 |
Andras Iklody
|
600a3f1192
|
Start scripts in background
|
2018-01-19 23:37:18 +01:00 |
Alexandre Dulaunoy
|
2e316994ed
|
Merge pull request #31 from mokaddem/tooltip_timeline
Timeline tooltip and redirect
|
2018-01-16 09:41:25 +01:00 |
Sami Mokaddem
|
3ae2882e97
|
feature: Added a tooltip in trendings' timeline + open a MISP tab on double click
|
2018-01-16 09:28:16 +01:00 |
Sami Mokaddem
|
70bddb359a
|
Merge pull request #30 from mokaddem/fixConversation
fix: Added a return statement in case of exception, preventing the execution of unwanted code
|
2018-01-16 08:41:11 +01:00 |
Alexandre Dulaunoy
|
1617df28aa
|
fix: a small typo in the wget command
|
2018-01-15 15:41:37 +01:00 |
Alexandre Dulaunoy
|
933e9e1907
|
Merge pull request #29 from mokaddem/multipleMerges
Addition of a timeline, recording of the time when org log-in and draft of a testing framework
|
2018-01-15 15:32:10 +01:00 |
Sami Mokaddem
|
2d5110f0a6
|
fix: z-index problem in ``geolocalisation``
|
2018-01-15 15:13:48 +01:00 |
Sami Mokaddem
|
7c61823284
|
Merge remote-tracking branch 'upstream/master' into multipleMerges
|
2018-01-15 15:07:07 +01:00 |
Sami Mokaddem
|
7767fa5a70
|
addition: added forgotten testall.sh script, which can be used rapidly test MISP-Dashboard
|
2018-01-15 14:59:53 +01:00 |
Sami Mokaddem
|
474ec72e19
|
fix: z-index problem (issue #27)
|
2018-01-15 14:31:51 +01:00 |
Sami Mokaddem
|
2cc957c87e
|
Merge remote-tracking branch 'upstream/master' into multipleMerges
|
2018-01-15 14:19:44 +01:00 |
Sami Mokaddem
|
1f22f6acb4
|
fix: added correct visjs dependencies
|
2018-01-15 14:19:11 +01:00 |
Steve Clement
|
0fa71408ae
|
- Added debug instructions
- Fixed redis-server foo (again)
- Added tuneables to start_all.sh
- The screen session now tell you what has been started
|
2018-01-06 20:51:23 +01:00 |
Steve Clement
|
3e3ee79882
|
- Fixed redis-server detection
|
2018-01-06 20:30:58 +01:00 |
Steve Clement
|
5529d64696
|
- Added comment on MaxMind DB
- Added preliminary checks for redis-server
|
2018-01-06 12:07:14 +01:00 |
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 |
Sami Mokaddem
|
1f4b10ea7f
|
fix: Added a return statement in case of exception, preventing the execution
|
2017-12-19 12:10:48 +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 |
Sami Mokaddem
|
89b46eba70
|
Added timeline for category
|
2017-12-18 15:31:22 +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 |
Sami Mokaddem
|
795dae2323
|
fix: Correctly set timeline's window bounds on page load. (Plus set the
end to the date+1 to see the whole day).
|
2017-12-13 09:03:52 +01:00 |
Sami Mokaddem
|
032f671d14
|
update: Display full label name in a html title.
|
2017-12-13 09:02:27 +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
|
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
|
ef6f9190b2
|
update: conf + added prints
|
2017-12-11 08:58:51 +01:00 |
Sami Mokaddem
|
f5757362db
|
fix: return flag_error value
|
2017-12-07 13:23:22 +01:00 |
Sami Mokaddem
|
139bd993a2
|
content: Added user test script
|
2017-12-07 13:05:31 +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
|
fe1003e475
|
Merge branch 'updateGeo' into testScripts
|
2017-12-07 10:10:04 +01:00 |
Sami Mokaddem
|
7f30131497
|
update: Reversed logic with errorFlag + Added it to test_geo
|
2017-12-07 09:51:50 +01:00 |
Sami Mokaddem
|
84f495bba8
|
Added trending test script
|
2017-12-07 09:48:07 +01:00 |