Commit Graph

1241 Commits (6711c7441ff646759fe5a7fef93fcd7789c88bf2)

Author SHA1 Message Date
Iglocska 5d7aa73e27 First version of the quick filters for the event view 2016-01-04 10:23:07 +01:00
Iglocska bab7044a8e Multiple file upload added to the add attachment functionality 2016-01-03 19:25:00 +01:00
Iglocska bc85591757 Fixes to the CSV export 2015-12-31 09:56:32 +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
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
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
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 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 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 a265553f71 Merge branch 'feature/fastupgrade' into 2.4 2015-12-25 00:35:24 +01:00
iglocska 7e2a935226 Fix to the templating being broken, fixes #787 2015-12-25 00:25:59 +01:00
iglocska 627f9abbd6 Fix to several issues with the sync and and an issue preventing the editing of events, fixes #788, fixes #784 2015-12-24 15:22:05 +01:00
iglocska a421b71443 CSV memory usage reduction on automation
- reduced the number of attributes at the cost of some additional processing time
- this should reduce very slow processing of large data sets
2015-12-23 01:20:41 +01:00
iglocska d769942a15 When adding/editing a sync user, the choice to limit a user by instance settings shows empty lines for instances without a name
- use the URL in those cases instead
2015-12-21 12:08:08 +01:00
iglocska 000449ee81 Editing an event via REST would not capture the tags
- if a user is a tagger the tag should be created (if not existing on the current instance) and added to the event
2015-12-21 11:46:33 +01:00
iglocska cb42337f9b Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2015-12-21 10:39:39 +01:00
iglocska 20acdd0622 Removed an accidental addition a while back 2015-12-21 10:38:45 +01:00
iglocska f963f8d7d8 Fixed a menu and some cleanup
- Freetext import was loading the wrong menu
- some leftover profiling code removed
2015-12-21 10:37:45 +01:00
Iglocska cc2e4171cf Don't run the anti IE 8 check on requests that don't have a user agent set, fixes #775 2015-12-19 19:41:17 +01:00
Iglocska 2c8940359c Editing an event with new attributes fails because a new id is not assigned correctly, fixes #773
- the process of detecting and editing existing attributes did not account for a case where the uuid is not set for an attribute and therefore should be saved as a new attribute. Fixed
2015-12-19 16:03:53 +01:00
Iglocska 5a44d79013 Fix for an issue with event edits containing a new attribute and it not getting an ID as expected 2015-12-18 18:31:43 +01:00
Iglocska cc57aa397e Invalid fetchevent call fixed for proposal add attachment 2015-12-18 17:17:42 +01:00
iglocska 9a7301972d Fixed an issue with discussions where a new thread would not have a default distribution and sharing group ID and would fail on creation, fixes #758 2015-12-16 08:59:31 +01:00
iglocska 3a682faf01 Various fixes
- resolved a missing variable issue on event views with no posts fixes #753
- removed some obsolete code
- sorted tags on the event view when assigning one to an event by name, fixes #416

	modified:   app/Model/Taxonomy.php
2015-12-16 00:48:30 +01:00
Iglocska bc2c14c815 Disable e-mailing globally for an instance 2015-12-15 10:52:31 +01:00
Iglocska 0161612d94 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
2015-12-14 11:59:23 +01:00
iglocska 4b115c8bfa Fixed an issue with the freetext importer where unsetting a duplicate value would not be reflected in the entry IDs
- this caused some attributes to be dropped from the end of the list
2015-12-14 11:50:37 +01:00
Iglocska 225c48ce4b Merge branch '2.4-syncrework' into 2.4-beta
Conflicts:
	app/Model/Event.php
2015-12-14 00:26:27 +01:00
Iglocska 8f5d21790c Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework
Conflicts:
	app/Controller/LogsController.php
2015-12-14 00:06:58 +01:00
Iglocska f1a54885ba Fixed the editing of sharing groups via event updates
- if a sync user adds / edits an event with a newer version of a sharing group
and the sync user is the local sync user of the SG or is an extender of the SG
then the sharing group will be updated

- valid changes:
  - Sharing group metadata changes
  - organisation detail changes (except uuid/name)
  - add / remove extend flag from orgs in the SG
  - add / remove all_orgs flag from servers in the SG
2015-12-14 00:03:45 +01:00
Iglocska 69d973c755 Event history now takes into account sharing groups 2015-12-13 21:28:10 +01:00
Iglocska 695e892d3c Fix to the event filtering on organisation
- org filters now accept org ID or org Name as parameter, fixing the sync filter

- Also, fix to saving sharing group IDs on sync edits on an attribute level
2015-12-13 17:20:40 +01:00
Iglocska 02143bbdc0 Capture the sharing groups of attributes on event edit 2015-12-12 22:51:32 +01:00
Iglocska 67fb8bfdcf Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework
Conflicts:
	app/Model/Event.php
2015-12-11 14:14:16 +01:00
Iglocska 73ab39aa26 Further fixes to the sync
- corrected the edit access rights for sync users with sharing groups
- Various fixes to the organisation sync and how creation / modification dates are transmitted
- Internal format differences compared to 2.3 causing mismatched field lookups fixed
2015-12-11 14:11:37 +01:00
Iglocska 55e66d7d74 Correct conversion of the own server before sync
- also a small fix to the event tags and unicode chars
2015-12-11 14:08:45 +01:00
Iglocska 1f3bfc3d6a Org and SG fixes for issues that are breaking the functionality 2015-12-10 10:54:31 +01:00
Iglocska 5ed1c27e43 Disable users
- users can now be disabled by an admin
- disabled users cannot login (via the UI or the API) and will be informed
- login attempts by disabled users are logged

- also added the expiration field for later use
2015-12-09 23:47:19 +01:00
Iglocska a009c56f66 Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 2015-12-09 23:02:58 +01:00
Iglocska bc63ed42b6 Fix to the Discussion boards 2015-12-09 23:01:37 +01:00
Iglocska 79b2ae520e Further progress on the sync rework 2015-12-09 23:00:21 +01:00
Iglocska 99e8263447 Small fixes 2015-12-09 02:29:04 +01:00
Iglocska b40e0fdc7c Merge branch 'master' into 2.4-syncrework
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/ComplexTypeTool.php
	app/Model/Attribute.php
	app/View/Pages/administration.ctp
2015-12-09 02:00:23 +01:00
Iglocska af92e29e3c Further progress on the sync
- also, added maintenance mode
- various fixes
2015-12-09 01:43:54 +01:00
iglocska 5f153b36c6 Invalid message fixed when accepting several proposals at once 2015-12-08 15:18:34 +01:00