Alexandre Dulaunoy
67ee53af06
Merge pull request #42 from P4rs3R/patch-4
...
Simply Python3
2018-03-14 17:11:11 +01:00
Alexandre Dulaunoy
05b491e0b4
Merge pull request #41 from P4rs3R/patch-3
...
Port option on redis-server
2018-03-14 17:10:07 +01:00
A. Cristallo
5da749cc2a
Simply Python3
...
With header /usr/bin/env python3.5 doesn't run with the last python3 (3.6), so imho it's better not specify the subversion (.5, .6 and so on), simply leaving "python3".
Tested with Python 3.6.3 onVM "Linux misp" (Ubuntu kernel 4.13 x64)
2018-03-14 17:08:45 +01:00
A. Cristallo
c7bddf41e7
Port option on redis-server
...
You can specify the port by adding "--port", "-p" doesn't rule. (Checked also on https://redis.io/topics/config )- "-p" is for redis-cli (https://redis.io/topics/rediscli ).
2018-03-14 16:56:55 +01:00
Sami Mokaddem
9e097326e3
Update config.cfg.default
...
Being consistent with launch script
2018-03-12 09:40:21 +01:00
Sami Mokaddem
3c4f36dc4b
Merge pull request #40 from P4rs3R/patch-2
...
simply python3
2018-03-07 18:22:56 +01:00
Sami Mokaddem
3f34204d0c
Merge pull request #39 from P4rs3R/patch-1
...
Simply python3
2018-03-07 18:22:40 +01:00
A. Cristallo
3a36928240
simply python3
...
With header /usr/bin/env python3.5 doesn't run with the last python3 (3.6), so imho it's better not specify the subversion (.5, .6 and so on), simply leaving "python3".
Tested with Python 3.6.3 onVM "Linux misp" (Ubuntu kernel 4.13 x64)
2018-03-07 18:13:17 +01:00
A. Cristallo
93576ce07a
Simply python3
...
With header /usr/bin/env python3.5 doesn't run with the last python3 (3.6), so imho it's better not specify the subversion (.5, .6 and so on), simply leaving "python3".
Tested with Python 3.6.3 onVM "Linux misp" (Ubuntu kernel 4.13 x64)
2018-03-07 18:07:40 +01:00
Alexandre Dulaunoy
d3f565ed20
Merge pull request #38 from mokaddem/master
...
Fix: Added a stroke to border the pie chart
2018-02-23 13:29:23 +01:00
Sami Mokaddem
3b6881fd26
fix #32 : Added black stroke for pie chart so that blank color is visible
2018-02-22 10:35:59 +01:00
Sami Mokaddem
6825e10128
Merge remote-tracking branch 'upstream/master'
2018-02-22 10:17:31 +01:00
Sami Mokaddem
fdcc02c77a
Merge remote-tracking branch 'upstream/master'
...
Resyncing with upstream
2018-02-22 10:13:04 +01:00
Sami Mokaddem
07a66403d9
Merge pull request #37 from mokaddem/quick-fix
...
fix: register tags from attributes
2018-02-22 09:48:18 +01:00
Sami Mokaddem
8e59307ab4
fix: Attribute 'Tag' in misp_json.Attributes does not contain the field 'Tag' anymore
2018-02-22 09:45:33 +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