MISP/app
Iglocska 1362cf40b7 Added org merge tool
- allows a site admin to merge all objects belonging to an organisation into another
  - this can be useful if duplicate organisations exist for example
  - the tool overrides the built in mechanism and should only be used if absolutely required
  - at the end of the process the original organisation is removed

- the tool generates 2 files that are dropped in the log directory of MISP
  - 1 contains a JSON with all the changed fields and the IDs
  - 1 contains an SQL script that allows an admin to revert the changes
2016-01-27 23:59:34 +01:00
..
Config Some changes to the default config file 2016-01-18 15:53:19 +01:00
Console Rework of the scheduled caching jobs 2016-01-10 19:45:33 +01:00
Controller Added org merge tool 2016-01-27 23:59:34 +01:00
Lib Fixed an issue with the freetext import 2016-01-23 20:19:44 +01:00
Locale/eng/LC_MESSAGES Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Model Added org merge tool 2016-01-27 23:59:34 +01:00
Plugin Merge branch 'master' into 2.4-beta 2015-11-08 23:26:19 +01:00
Test replace Risk with ThreatLevel [skip ci] 2013-11-17 17:54:15 +01:00
Vendor Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
View Added org merge tool 2016-01-27 23:59:34 +01:00
files MISP taxonomies sub-module updated 2016-01-15 10:36:21 +01:00
tmp Removed nested gitignores 2015-11-23 19:44:57 +01:00
webroot Added org merge tool 2016-01-27 23:59:34 +01:00
.htaccess Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Makefile Static program analysis 2012-12-19 03:08:52 +00:00
index.php Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00