MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
7,607 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

5895 Commits (7f365746f9dbc7988934ab604259714eee8bcb38)

Author SHA1 Message Date
iglocska 9ba1af9645 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-04-09 13:59:17 +02:00
iglocska 025b2a4e5d fix: valueNotEmpty() switched to stringNotEmpty for the attribute value validation 
- Core 1+2 of the new laptop
 2018-04-09 13:58:24 +02:00
Alexandre Dulaunoy cce695ab2a
fix: MISP taxonomies updated to the latest version 2018-04-09 10:21:45 +02:00
iglocska 403f904a80 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-04-08 23:12:29 +02:00
iglocska cf49732799 fix: Fixed issues with non string server settings when changing them via the console 2018-04-08 23:11:51 +02:00
Alexandre Dulaunoy 189654f5a7
fix: MISP galaxy clusters updated to the latest version 2018-04-08 16:58:27 +02:00
iglocska 30ac60514b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-04-07 23:58:18 +02:00
iglocska 1cf495c201 fix: Fixed missing reason for failure if the freetext import had a single attribute fail during the saving process, fixes #3141 2018-04-07 23:57:23 +02:00
Sami Mokaddem 57d4277dfe fix: unknown meta-category do not longer raise an exception (use a default value instead) 2018-04-06 07:37:41 +00:00
iglocska 721cbe1791 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-04-05 07:18:19 +02:00
iglocska 1b90b2e1eb fix: Editing an object "loses" comment, fixes #3133 2018-04-05 07:17:43 +02:00
Andras Iklody 64870aaada
Merge pull request #3134 from chkp-aliaksandrt/fix-object-deletion-buttons-title 
fix: Fix wrong object's deletion buttons title
 2018-04-04 22:00:07 +02:00
StefanKelm 8692e7457a
Update EventShell.php 2018-04-04 12:26:12 +02:00
chkp-aliaksandrt ced2e66a6a
fix: Fix wrong object's deletion buttons title depending on the `deleted` property 2018-04-04 13:19:54 +03:00
iglocska 9485dfe5e2 chg: Refactor of the complex type tool 
- makes it more readable
 2018-04-03 22:25:52 +02:00
iglocska ed70624354 new: Added event/attribute add/edit to the restresponse describe functionality 2018-04-02 21:53:08 +02:00
iglocska a057bc64a7 fix: Don't try to run the testBaseURL server setting check if the user comes from the CLI 2018-04-01 17:36:51 +02:00
iglocska 66a0dec11c new: Added server setting management via the command line 
- Usage:

  - /var/www/MISP/app/Console/cake Admin getSetting [setting]
    - setting is optional, if none set "all" is assumed
    - returns all or a specific setting's current value and metadata

  - /var/www/MISP/app/Console/cake Admin setSetting [setting] [value]
    - set a given server setting by full setting name
    - for example the following will enable the import services:
      -  /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Import_services_enable" 1

- This feature was created in support of the CIRCL global conglomerate's APAC HQ in Tokyo
 2018-04-01 17:31:31 +02:00
iglocska 98bf40eb71 new: Cleanup of role permissions 
- fixed name of admin -> org admin
- changed order of org admin <-> site admin
- descriptions updated and now visible by hovering over any permissions' titles
 2018-03-31 23:27:47 +02:00
iglocska e89d7ebc16 new: Added separation between enabled feeds and feeds enabled for caching 2018-03-30 23:30:54 +02:00
iglocska f0a21033e2 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-03-29 22:04:28 +02:00
iglocska a7357f61ca fix: IDS flag not set when editing attribute, fixes #3126 2018-03-29 22:03:42 +02:00
Alexandre Dulaunoy 118b4d12b0
fix: MISP galaxy updated to the latest version 2018-03-29 16:34:54 +02:00
StefanKelm 7581f9954b
Removed trustedsec.com and openbl.org 
Removed https://www.trustedsec.com/banlist.txt and http://www.openbl.org as per https://github.com/MISP/MISP/issues/2541
 2018-03-29 13:53:11 +02:00
chrisr3d 9c512062ea
chg: Removed a succession of conditional statements using a dictionary 2018-03-29 11:04:50 +02:00
Raphaël Vinot 628d46d823
Merge pull request #3119 from 3c7/bugfix/url_default_category 
Different category in typeDefinition / defaultCategory
 2018-03-29 10:24:03 +02:00
chrisr3d 27c9a8589f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-03-29 00:15:00 +02:00
chrisr3d 7f8dff5008
fix: Tranformed function not using self as staticmethod as it should be 2018-03-29 00:13:04 +02:00
chrisr3d aa9eea68f4
fix: Skipping ttps parsing from external stix atm to avoid bugs 2018-03-29 00:11:00 +02:00
Nils Kuhnert 27e0150692
Assigned "Network activity" as default category for url in $typeDefiitions as defined in $defaultCategories 2018-03-28 15:09:35 +02:00
iglocska 64b987c8f2 fix: Date order fixed in event view 
- Now time for fika
 2018-03-28 11:47:01 +02:00
iglocska 74937ea934 fix: Fixed the contactination issue from before 2018-03-28 11:41:27 +02:00
iglocska 9a692346a3 fix: Fixed a crappy event concatination bug for restsearch 2018-03-28 11:35:31 +02:00
iglocska d7d9a07ee5 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-03-28 11:20:42 +02:00
iglocska 8cd92edebb fix: Added missing changes in evnet.php 2018-03-28 11:20:16 +02:00
iglocska 961bef7f1e fix: Financial tool result included in event 
- also removing trailing . from domain names
 2018-03-28 11:08:00 +02:00
Andras Iklody d9c7523ef6
Merge pull request #3106 from ldelavaissiere/patch-1 
Update default.ctp in order to fix issue #3105
 2018-03-27 19:43:10 +02:00
Laurent de la V b5f0f97ddb
Update default.ctp in order to fix issue #3105 
Re: https://github.com/MISP/MISP/issues/3105
Adding a <meta> viewport element giving the browser instructions to set the width of the page to follow the screen-width of the device fixes the issue
 2018-03-27 19:34:19 +02:00
StefanKelm a520ebc7e2
Update default.pot 2018-03-27 16:31:34 +02:00
StefanKelm ce705404dd
Update user_management.ctp 2018-03-27 16:24:33 +02:00
StefanKelm 11c530d658
Update Server.php 2018-03-27 16:18:54 +02:00
StefanKelm 9f53f70ccf
Update default.pot 2018-03-27 16:12:50 +02:00
StefanKelm 8cf6324235
Update verify_g_p_g.ctp 2018-03-27 16:04:49 +02:00
StefanKelm 0e2c4c5e8b
Update edit.ctp 2018-03-27 16:04:16 +02:00
StefanKelm 68bceee8ee
Update check_and_correct_pgps.ctp 2018-03-27 16:03:36 +02:00
StefanKelm d73f62a9c0
Update admin_email.ctp 2018-03-27 16:03:00 +02:00
StefanKelm 8e3912d0c3
Update admin_edit.ctp 2018-03-27 16:02:24 +02:00
StefanKelm 5982c4501a
Update admin_add.ctp 2018-03-27 16:01:41 +02:00
StefanKelm 1f802c18de
Update user_management.ctp 2018-03-27 16:00:23 +02:00
StefanKelm e524268957
Update administration.ctp 2018-03-27 15:58:55 +02:00