Commit Graph

14946 Commits (2b2c93b766f9ac05e7bfc5d47de3b005ffe3be8a)

Author SHA1 Message Date
Steve Clement 2b2c93b766
Merge pull request #5858 from stricaud/debian
Adding the apache modules enablement in preinst
2020-05-05 21:56:20 +09:00
Christian Studer e25bab56aa
Merge pull request #5857 from RichieB2B/ncsc-nl/cybox-version
fix: [stix export] Bump minimum CybOX version to 2.1.0.21
2020-05-05 11:41:19 +02:00
Sebastien Tricaud 0b2474824d Adding the apache modules enablement in preinst 2020-05-04 16:44:38 -07:00
chrisr3d c2c43fbd2d Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-05-04 16:56:20 +02:00
chrisr3d 7b44f4eaa4
fix: [stix2 export] Fixed stix2 imports
- All the required features are imported and we no
  longer import them with *
2020-05-04 16:52:12 +02:00
Richard van den Berg a096cdfb98 fix: [stix export] Bump minimum CybOX version to 2.1.0.21 2020-05-04 15:59:17 +02:00
Alexandre Dulaunoy f8b8b8b713
chg: [misp-objects] updated to the latest version 2020-05-04 13:43:08 +02:00
Andras Iklody db2ae605a8
Merge pull request #5850 from stricaud/debian_2_4_125
Updates on debian package for 2.4.125
2020-05-04 07:22:53 +02:00
stricaud c1ee4d8bfb
Merge branch '2.4' into debian_2_4_125 2020-05-02 11:14:39 -07:00
Sebastien Tricaud fa65fc68bb Some changes which improve how Mysql user can be accessed by default, remove the enablement of
apache modules in postinst (moved them to preinst).
2020-05-02 11:10:58 -07:00
Sebastien Tricaud ae23d0d86a Added new version bump in changelog 2020-05-02 11:09:47 -07:00
Sebastien Tricaud 9b7aab6565 Adding installation of cakeresque config 2020-05-02 11:09:16 -07:00
Sebastien Tricaud 1c64d6c7de Adding the preinst where required apache modules are enabled 2020-05-02 11:08:24 -07:00
Sebastien Tricaud 105a72e80f If the submodules have not been initialized and updated, the debian package will build.
However the installation will not be a success.
2020-05-02 11:07:24 -07:00
Steve Clement 690f2adf07
chg: [installer] Bump version 2020-05-01 12:25:30 +09:00
Steve Clement dc62c58d54
Merge pull request #5846 from SteveClement/guides
chg: [doc] Make misp-modules work again
2020-05-01 12:24:23 +09:00
Steve Clement 3a82e37e90
chg: [doc] Make misp-modules work again 2020-05-01 12:22:28 +09:00
iglocska be946bf09b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-30 16:06:08 +02:00
iglocska f9cbe42aa8
new: [statistics] added contributing org count 2020-04-30 16:05:15 +02:00
Steve Clement 4604aa4762
chg: [installer] Version Bump 2020-04-30 19:46:18 +09:00
Steve Clement c7d8338e74
Merge pull request #5843 from SteveClement/tools
fix: [installer] Embarassing typo no1, 7.3!=7.4
2020-04-30 19:45:47 +09:00
Steve Clement 32a789a4c5
Merge remote-tracking branch 'upstream/2.4' into tools 2020-04-30 19:45:12 +09:00
Steve Clement 5a0c500190
fix: [installer] Embarassing typo no1, 7.3!=7.4 2020-04-30 19:41:34 +09:00
iglocska f278407e91
chg: [VERSION] bump 2020-04-30 11:50:22 +02:00
iglocska 9b46c62428
chg: [pymisp] bump 2020-04-30 11:49:42 +02:00
Steve Clement 833af7c114
Merge pull request #5207 from JakubOnderka/patch-33
fix: [internal] Just site admin can force when saving freetext
2020-04-30 18:21:04 +09:00
Steve Clement 5719c5808a
Merge pull request #5842 from SteveClement/tools
chg: [new] Added QEMU support
2020-04-30 18:10:15 +09:00
Steve Clement ce63b8c178
chg: [new] Added QEMU support 2020-04-30 18:05:51 +09:00
Alexandre Dulaunoy 2431cda057
chg: [warning-lists] updated to the latest version 2020-04-30 09:15:10 +02:00
Alexandre Dulaunoy b19a72493f
chg: [misp-objects] updated to the latest version 2020-04-30 09:14:06 +02:00
Alexandre Dulaunoy 799506dcc9
chg: [misp-galaxy] updated to the latest version 2020-04-30 09:12:55 +02:00
mokaddem bfd2bc5277
Merge branch 'eventTimeline-sightings' into 2.4 2020-04-30 08:38:57 +02:00
mokaddem 8525dda7f8
Merge remote-tracking branch 'origin/2.4' into eventTimeline-sightings 2020-04-30 08:38:39 +02:00
iglocska d2ff0866a0
Merge branch '5802' into 2.4 2020-04-30 08:30:54 +02:00
iglocska e2bbece354
Merge branch '2.4' of github.com:MISP/MISP into 5802 2020-04-30 08:30:01 +02:00
iglocska 4e0ef6f28e
new: [internal] cache the sharing group access lookups
- should reduce the number of queries drastically for events heavy on object/attribute level sharing groups
2020-04-30 08:29:17 +02:00
Steve Clement adadaba064
chg: [installer] Version bump 2020-04-30 15:20:30 +09:00
Steve Clement b2b49b1970
Merge pull request #5841 from SteveClement/guides
fix: [installer] Bug where the wrong php deps would get installed
2020-04-30 15:20:01 +09:00
Steve Clement 4ac89bec86
fix: [installer] Bug where the wrong php deps would get installed 2020-04-30 14:56:06 +09:00
iglocska 952e468013
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-30 07:12:55 +02:00
iglocska 01b552d7e9
Revert "Merge branch '5835' into 2.4"
This reverts commit 48132af179, reversing
changes made to 9a22aa1f3c.
2020-04-30 07:09:56 +02:00
iglocska 49499f1df8
Merge branch '5834' into 2.4 2020-04-30 07:07:25 +02:00
iglocska 48132af179
Merge branch '5835' into 2.4 2020-04-30 07:06:10 +02:00
iglocska 9a22aa1f3c
chg: [db_schema] bumped 2020-04-30 06:55:21 +02:00
iglocska 4768e54b8b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-30 06:47:36 +02:00
iglocska 2de54d59e5
fix: [user settings] corrected field name 2020-04-30 06:46:46 +02:00
Steve Clement 76ed9a1eeb
chg: [installer] Update installer to latest 2020-04-30 13:42:28 +09:00
Steve Clement 3988cbbe5c
Merge pull request #5840 from SteveClement/tools
chg: [installer] Initial 20.04 support
2020-04-30 13:41:45 +09:00
Steve Clement 1f20f90315
chg: [installer] Initial 20.04 support 2020-04-30 13:40:13 +09:00
Steve Clement baff30ffd1
fix: [installer] Fix a bug where the installer fails if apt update has never been run 2020-04-30 13:27:19 +09:00