Iglocska
abb3340bff
Reverted some contextual org fields to nullable
2016-01-06 21:10:57 +01:00
Iglocska
da57e038c0
Some cleanup
2016-01-05 23:53:23 +01:00
Iglocska
62b9f86517
Added tags to the CSV export, fixes #809
2016-01-05 23:50:44 +01:00
Iglocska
7c1e729524
Rework of the CSV export to include tags
2016-01-05 23:26:13 +01:00
Iglocska
e796be5bae
Merge branch '2.4' of https://github.com/MISP/MISP into 2.4
2016-01-04 21:34:18 +01:00
Iglocska
660f3a80be
Updated upgrade.txt
2016-01-04 21:33:51 +01:00
Alexandre Dulaunoy
4eafb38c15
Branch changed for Travis
2016-01-04 20:25:04 +01:00
Raphaël Vinot
e5f1ee1be8
Merge pull request #807 from Rafiot/clean_travis
...
Update travis for 2.4, use Ubuntu Trusty
2016-01-04 18:20:44 +01:00
Raphaël Vinot
7b401141f2
Update travis for 2.4
2016-01-04 18:11:56 +01:00
Iglocska
52f429e3c7
Quickfilter added for users
2016-01-04 11:57:21 +01:00
Iglocska
6711c7441f
Added malware sample to the file attribute filter
2016-01-04 10:28:41 +01:00
Iglocska
5d7aa73e27
First version of the quick filters for the event view
2016-01-04 10:23:07 +01:00
Iglocska
f580dc2ece
Payload delivery is now the default option for add attachment
2016-01-03 19:27:25 +01:00
Iglocska
bab7044a8e
Multiple file upload added to the add attachment functionality
2016-01-03 19:25:00 +01:00
Iglocska
f3d1a55702
Removed the test values for some attribute descriptions
...
- still needs some work, few empty ones remain and a few descriptions could use clarification
2016-01-02 20:02:26 +01:00
Iglocska
85c2360212
Merge branch 'portip' into 2.4
...
Conflicts:
app/Model/Attribute.php
2016-01-01 14:17:50 +01:00
Alexandre Dulaunoy
a5a142295b
Typo fixed in whois-creation-date
2015-12-31 12:24:55 +01:00
Alexandre Dulaunoy
676ff75f25
Merge pull request #800 from FafnerKeyZee/2.4
...
Adding more information about Whois
2015-12-31 10:44:58 +01:00
Iglocska
bc85591757
Fixes to the CSV export
2015-12-31 09:56:32 +01:00
Iglocska
c6143fc1b3
Invalid org capture method lead to orgs with empty UUIDs being matched with the first org with no uuid
2015-12-30 20:35:39 +01:00
Iglocska
6ea6addb16
Add today's date as the event date field if not set
2015-12-30 11:20:04 +01:00
Iglocska
14942abf87
Removal of PGP key generation for travis
2015-12-30 10:44:49 +01:00
Iglocska
a06da3e90b
Fixes to the first user initialisation
...
- updated the UserInit command line tool
- updated the built in user initialisation
2015-12-30 09:54:43 +01:00
Iglocska
af062c7b84
Fixed a typo in the logging that prevented users from being edited, fixes #586
...
- A wrong variable lookup in the logging caused user edits to fail
2015-12-29 20:08:09 +01:00
Iglocska
007b4dbfae
Fixes to some of the exports, fixes #798
...
- Fixed a typo that prevented the event level parameters to be used in the CSV export
- Fixed an issue where adding the contextual info in a CSV could lead to an invalid CSV if an event info field had a linebreak in it
- Tuned the performance of time based filtering (until now it would lookup events that should have been excluded in the first place, only to throw them away after the lookup again)
2015-12-29 20:04:26 +01:00
Fafner [_KeyZee_]
9f4dc4b0b8
Update Attribute.php
2015-12-29 18:46:23 +01:00
Fafner [_KeyZee_]
c16eb6474e
Merge pull request #1 from MISP/2.4
...
Update from original)
2015-12-29 15:01:22 +01:00
Alexandre Dulaunoy
959b7e9cee
Initial JSON schema - MISP event (version 2.4)
2015-12-29 14:47:21 +01:00
iglocska
3df592ceae
Merge branch '2.4' of https://github.com/MISP/MISP into 2.4
2015-12-29 01:17:18 +01:00
iglocska
4f715073c0
Changed the attachment distribution settings to match the attribute distribution settings, fixes #777
...
- added inherit event as a distribution option for attachments
2015-12-29 01:16:24 +01:00
Alexandre Dulaunoy
22c366867c
Merge branch '2.4' of github.com:MISP/MISP into 2.4
2015-12-28 20:28:39 +01:00
Alexandre Dulaunoy
2ac6477148
Updated to the latest version of PyMISP
2015-12-28 20:28:01 +01:00
Andras Iklody
c162443fe5
Merge pull request #797 from FafnerKeyZee/2.4
...
Solving #786
2015-12-28 16:28:28 +01:00
Fafner [_KeyZee_]
ead30f6846
Solving #786
2015-12-28 16:17:11 +01:00
Fafner [_KeyZee_]
be3d35c014
Solving #786
2015-12-28 16:12:31 +01:00
Andras Iklody
f580d758f7
Merge pull request #796 from FafnerKeyZee/2.4
...
Fix for orgc_id into TemplatesController.php
2015-12-28 16:00:12 +01:00
Fafner [_KeyZee_]
01756dd261
Update TemplatesController.php
2015-12-28 15:40:09 +01:00
iglocska
728425aedd
Invalid orgc lookup in the template choice menu, fixes #795
2015-12-28 15:03:06 +01:00
iglocska
d4990d957a
Fixed some issues with the index length of the value fields in the MYSQL.sql file, fies #793
...
- Also some additional issues resolved
2015-12-28 14:05:13 +01:00
iglocska
1f5f963bb6
Create cached export dirs if they don't exist, fixes #791
...
- until now it was assumed that the dirs are already created
- just create them if they don't exist
2015-12-28 00:03:52 +01:00
iglocska
79a074880f
Invalid lookup of servers for the scheduled pull
...
- it was erroneously looking up servers that have push enabled instead of pull
2015-12-27 23:29:12 +01:00
iglocska
fea225c409
Rework of the contributor field, some MYSQL.sql tweaks
...
- added indeces to the MYSQL.sql file
- contributors now looks for shadow attributes instead of log entries (should make the event view much faster and resolve some timeout issues on sync when the log is massive)
2015-12-27 19:00:35 +01:00
iglocska
9e3e362ea6
Fixes a bug on invalid event IDs passed to the STIX export causing long execution times, fixes #747
...
- Running a stix export for a specific ID that doesn't exist results in a full STIX export for the user (events visible to the user)
- This leads for an unnecesarily long export process when a quick export is expected
2015-12-26 11:32:31 +01:00
iglocska
66a90cd60c
Several fixes to the exports, fixes #790
...
- New generic fetch attribute method was mistakenly using the order field as a condition, resulting in some exports only displaying a subset of the data
- the fix to this fixes the issue described in #790 for text exports
- Fix to the RPZ exports not working correctly
- Fix to the horrible performance of RPZ exports
- Fix to several background worker issues with exports
2015-12-26 02:50:50 +01:00
iglocska
ba95648fa5
Fixed some background worker issues
...
- scheduled pulls would fail because of invalid user object passed
- invalid permissions checks / org checks would cause the RPZ export to fail when using background workers
2015-12-26 01:35:34 +01:00
iglocska
a265553f71
Merge branch 'feature/fastupgrade' into 2.4
2015-12-25 00:35:24 +01:00
iglocska
2339fce8c7
Index Correlation values
2015-12-25 00:33:36 +01:00
iglocska
22b02c4075
Added the reindexing of all tables to the upgrade procedures.
2015-12-25 00:31:49 +01:00
iglocska
85db894063
Left off from previous commit
2015-12-25 00:26:45 +01:00
iglocska
7e2a935226
Fix to the templating being broken, fixes #787
2015-12-25 00:25:59 +01:00