Commit Graph

267 Commits (274cade47efb2cfdde829a588ec9a459cae0c805)

Author SHA1 Message Date
Alexandre Dulaunoy 925b950a0b Merge pull request #51 from deralexxx/patch-3
mention manifest.json for local feeds
2017-06-20 13:56:13 +02:00
Alexander J c8ed535be3 Update README.md 2017-06-20 12:39:42 +02:00
Alexander J bccb6e2d6c mention manifest.json for local feeds
````
it is totally described in the not yet written manual that is in my head and will one time surely make it into MISP-book
````
it is now also in MISP-book
2017-06-20 11:28:50 +02:00
Alexandre Dulaunoy 560719dd78 Merge pull request #50 from deralexxx/sync
first hackathon 2017
2017-06-11 19:23:34 +02:00
deralexxx 8145ae416f first hackathon 2017
one more trouble shooting thing
2017-06-11 13:15:42 +02:00
deralexxx 9ec01731c2 first hackathon 2017
mention events, sharing groups and recommendations
2017-06-11 13:06:06 +02:00
Alexandre Dulaunoy 7c3167e7e3 Add more zmq examples 2017-05-30 17:56:07 +02:00
Alexandre Dulaunoy 1d6831d390 zmq: update to the example and the self topic channel 2017-05-30 16:49:17 +02:00
Alexandre Dulaunoy e8168fc107 Firt version of the ZeroMQ documentation 2017-05-30 07:59:22 +02:00
Alexandre Dulaunoy 5b6dfb83da First version of the ZeroMQ pub-sub in MISP 2017-05-30 07:58:58 +02:00
Alexandre Dulaunoy b945205d70 Merge pull request #49 from SHSauler/patch-1
Minor typo: suport -> support
2017-05-18 16:43:37 +02:00
Steffen Sauler 8b694828f5 Minor typo: suport -> support 2017-05-18 15:50:31 +02:00
Alexandre Dulaunoy 9d0f606ed8 Get Your Instance added 2017-04-11 23:27:36 +02:00
Alexandre Dulaunoy f993c46f00 Merge pull request #47 from Delta-Sierra/temp
Sightings chapter
2017-04-11 16:45:57 +02:00
Alexandre Dulaunoy 603190dcd7 Merge pull request #48 from michael-hamm/master
Get your own MISP instance
2017-04-11 16:45:23 +02:00
Michael Hamm 95a16b928c Get your own MISP instance 2017-04-11 16:24:33 +02:00
Déborah Servili 370bf8324e add sightings to summary 2017-04-11 10:35:13 +02:00
Déborah Servili 0c74ea2e0b add Sightings GUI 2017-04-11 09:41:31 +02:00
Alexandre Dulaunoy d81b5dbbda Updated including book convention 2017-04-08 11:56:34 +02:00
Alexandre Dulaunoy dab82f5df6 Book convention added 2017-04-08 11:55:26 +02:00
Alexandre Dulaunoy a0fc8d6834 Typo fixed 2017-04-07 22:06:35 +02:00
Alexandre Dulaunoy 77f2befdd6 Merge pull request #44 from deralexxx/sync
Sync
2017-04-07 21:38:34 +02:00
deralexxx 07e0b0a729 typo + rules 2017-04-07 21:28:25 +02:00
deralexxx 62ae8b13d1 first commit for the new part 2017-04-07 21:17:59 +02:00
Déborah Servili 239c9d56a3 sightings chapter - wip 2017-04-04 14:09:20 +02:00
Alexandre Dulaunoy ce17cba611 Merge pull request #43 from Delta-Sierra/temp
update galaxies chapter
2017-04-03 19:29:53 +02:00
Déborah Servili c774a2da33 update galaxies chapter 2017-04-02 17:09:52 +02:00
Alexandre Dulaunoy 3b8720062c Typo fixed 2017-03-30 12:02:23 +02:00
Alexandre Dulaunoy 942dc4f0d1 Clean-up 2017-03-30 11:46:58 +02:00
Alexandre Dulaunoy 3ed0d0f418 Some typo fixed 2017-03-30 11:36:20 +02:00
Alexandre Dulaunoy 886ce63a2c Clearer 2017-03-30 11:31:55 +02:00
Alexandre Dulaunoy 7f658e3785 Twitter url added 2017-03-30 11:31:13 +02:00
Alexandre Dulaunoy c85b3d0c1c Warning 101 2017-03-30 11:23:32 +02:00
Alexandre Dulaunoy e116e9d809 warning back and forth 2017-03-30 11:22:23 +02:00
Alexandre Dulaunoy 8adf7d91d4 warning fun is there 2017-03-30 11:21:18 +02:00
Alexandre Dulaunoy 5955e0790c autocover removed 2017-03-30 11:19:49 +02:00
Alexandre Dulaunoy 8920e99cc3 Cover added 2017-03-30 11:19:33 +02:00
Alexandre Dulaunoy ad152c984f Delegation intro updated 2017-03-30 10:51:08 +02:00
Alexandre Dulaunoy 1c0c77a14d Merge pull request #42 from Delta-Sierra/temp
update delegation chapter
2017-03-30 10:18:28 +02:00
Déborah Servili 081013c4e8 Shaaaaping 2017-03-30 10:07:38 +02:00
Déborah Servili 97f3c9f35b update delegation chapter 2017-03-30 09:41:57 +02:00
Alexandre Dulaunoy 814a5418fc add: Delegation added 2017-03-24 17:15:43 +01:00
Alexandre Dulaunoy ae1761977e Merge pull request #41 from Delta-Sierra/temp
add delegation chapter - still in progress
2017-03-24 16:38:25 +01:00
Déborah Servili 2670dc419b add delegation chapter - still in progress 2017-03-24 16:30:11 +01:00
Alexandre Dulaunoy 119c4416f0 Typo fixed 2017-02-20 13:49:29 +01:00
Alexandre Dulaunoy 825a2c053a Introduction to Feeds 2017-02-20 11:47:20 +01:00
Alexandre Dulaunoy 17d6daa0f8 Merge pull request #40 from Delta-Sierra/temp
Managing Feed chapter
2017-02-20 11:21:18 +01:00
Déborah Servili 87d6ebe4ef improving layout+2 2017-02-20 10:41:40 +01:00
Déborah Servili 4553335691 improving layout+1 2017-02-20 10:26:22 +01:00
Déborah Servili cb8270e1bc improving layout 2017-02-20 10:23:16 +01:00