MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
3,304 Commits
33 Branches
364 Tags
185 MiB
Commit Graph

81 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
iglocska 485c007b39 Merge branch 'master' into 2.4-beta 
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/EventTag.php
	app/Model/TemplateElementAttribute.php
	app/Model/TemplateElementFile.php
	app/Model/TemplateElementText.php
	app/Model/ThreatLevel.php
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/eventattributerow.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
 2015-11-17 01:14:51 +01:00
iglocska b3a2428345 Merge branch 'basedir' into hotfix-2.3.160 
Conflicts:
	app/Controller/AppController.php
	app/View/Pages/administration.ctp
 2015-11-17 00:33:34 +01:00
pugilist ec7d85332c modified many instances of html anchors and javascript document.location to use 2015-11-08 15:38:24 -05:00
Iglocska e1a95c62b0 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Attribute.php
	app/View/Users/statistics.ctp
 2015-09-10 15:02:44 +02:00
Iglocska bc06362d19 Fixed XSS in several views 
- reported by Roberto Suggi Liverani from NCIA
 2015-09-09 19:26:06 +02:00
Iglocska 1e3db8a8ba Further work on the new version 
- org checks fixed in a lot of places
- fixed the searches to work with the new organisations
 2015-04-14 17:51:38 +02:00
Iglocska b163164450 Further work on the sharing groups 2015-04-13 17:52:04 +02:00
iglocska 12692284fa Changed the annoying click to view feature on each row on certain index pages to double clicks 2014-12-05 15:27:54 +01:00
iglocska 2e1dfca943 Attribute search now correctly searches attribute comments too for contained expressions, fixes #342 2014-12-05 10:13:07 +01:00
iglocska 2e28dd2dde Added tooltip for event ID in attribute search results, fixes #351 2014-12-03 17:23:32 +01:00
iglocska 2c7b7415b9 Improvements to the attribute search 
- case insensitivity
- tag searches

also, generatecorrelation is now a background job
 2014-11-20 10:40:24 +01:00
iglocska 79127902b7 Cleanup, MISP health tool 
- cleanup of a lot of deprecated settings
- tool to help assess and alter issues with the instance settings
- new mechanism to store settings
 2014-09-10 09:43:22 +02:00
iglocska 4776b91f98 Visual changes to the attribute list / search Fixes #162 
- org shown for each attribute
- performance improvement (only necessary fields loaded for the event)
 2014-02-05 15:22:42 +01:00
iglocska 8a53831b2d Update to the discussions 
- Moved the menues out of the views to the common menu element
 2013-11-04 11:31:15 +01:00
iglocska d7b4c28552 Contextual comments 
- Attributes now have a comment field
 2013-10-30 16:00:46 +01:00
iglocska d5d2e900c4 First revision of the unified menu and XML upload 
- centalising the side menu for easier maintainability

- XML upload of event(s) from the interactive interface
 2013-10-24 10:33:34 +02:00
Christophe Vandeplas cb6482fd54 Merge branch 'develop' into 'master' for v2.1 2013-08-02 15:39:54 +02:00
iglocska 66a7791b33 Pivot threads and other changes 
- Users can now see the path they took while jumping from related event to related event

- Removed the breadcrumbs

- Some UI changes (user menues were not showing the active page, etc)
 2013-08-02 11:53:17 +02:00
iglocska 8d2595d592 Breadcrumbs for the views 
- makes navigating the site easier
- some new css changes to support this
 2013-07-31 15:08:10 +02:00
iglocska a828104a72 Attribute index UI bug fixed 2013-07-04 16:20:57 +02:00
iglocska d9efaab416 Some more HTML fixes 2013-07-03 11:21:04 +02:00
iglocska 40edeb7557 HTML error fix 
- div id starting with a digit (the id wasn't needed anyway so removed
it)
 2013-07-03 10:46:24 +02:00
iglocska abde2a47af Several fixes 
- Fixed the search pagination beyond the first page

- Hard coded routing of the menues in the global actions area
 2013-06-28 14:28:58 +02:00
iglocska 568d243e6e IOC -> IDS name change for attribute index 
- also for attribute add and edit
 2013-06-27 14:28:54 +02:00
iglocska 3812d02309 Search result downloads (CSV format) 
- added the button for the CSV download
- fixed a bug with the csv search result downloader blocking non IOC
results even if the search terms did not specify IOCs only.
 2013-06-27 13:53:49 +02:00
iglocska 93b39eb76d Some UI changes 
- Signature / IDS Signature changed to IOC
 2013-06-27 12:08:58 +02:00
iglocska 24ebbcca5c Update to the attribute search 
- Use ! to exclude terms in the value/id/org fields

- org search works the same way as value / id now, you can enter several
terms separated by a newline. Also, adding ! infront of a term will
exclude the organisation from the results

- sub string search for organisations
 2013-06-24 13:24:08 +02:00
Christophe Vandeplas 136b929801 shows spaces in attribute value. fixes #19 2013-06-19 11:05:34 +02:00
iglocska 708156ee49 Some UI changes and partial update to the manual 2013-06-13 16:10:28 +02:00
Christophe Vandeplas 68c2fd09fe Merge branch 'develop' of https://github.com/MISP/MISP into feature/sync/timestamp 
Conflicts:
	app/View/Attributes/index.ctp
	app/View/Events/add.ctp
	app/View/Events/edit.ctp
 2013-06-10 23:00:37 +02:00
Iglocska b74179bc84 Further work on the distribution 2013-06-10 21:38:04 +02:00
Christophe Vandeplas d81ffe56b7 Performance improvement with static urls 2013-06-10 11:31:46 +02:00
iglocska f2a5efc9d4 Fix to the highlight issue 
- new line at the end of the search list would break the highlighter and
  throw a warning
  - fixed
 2013-06-07 12:40:40 +02:00
Christophe Vandeplas 0d66ef931a UI tooltip love 2013-06-06 18:06:22 +02:00
Christophe Vandeplas bdc973f9ed alignment of action buttons 2013-06-03 14:44:31 +02:00
iglocska 7691476fae More UI changes 2013-06-03 10:48:38 +02:00
Christophe Vandeplas bd50135fe6 UI events partial improvements 2013-06-01 08:46:21 +02:00
Christophe Vandeplas d3db196699 UI Logs, documentation, memberslist and fixed bug in highlight 2013-05-31 17:38:46 +02:00
Christophe Vandeplas 0deff7d5a5 attribute search and list 2013-05-31 11:35:27 +02:00
Christophe Vandeplas d099ca8e1c hilight row 2013-05-30 16:40:47 +02:00
Christophe Vandeplas d0afda8df5 minor improvements 2013-05-30 11:40:07 +02:00
Christophe Vandeplas 0fa30912a3 mirated first parts of nice GUI proposed by Alexandru of CERT-EU 2013-05-30 11:14:00 +02:00
iglocska 5f476fa957 Fix for the search 
- Due to the sanitization being fixed, the search results broke

- This is a quick copy of the fix implemented on develop by cvandeplas
 2013-05-29 14:19:36 +02:00
iglocska 6e9b19ce51 Quick fix to the sanitization 
- the double sanitization needed a quick fix until the development branch
  gets merged in the future
 2013-05-24 10:29:08 +02:00
Andras Iklody b98818ebfb Small errors with the merge corrected 
- some errors managed to slip through during the merge, should be fixed
 2013-04-25 15:37:49 +02:00
Andras Iklody 4396cec8ea Integrated ownership, ACL and minor fixes 
- Orgs can propose new attributes or changes to existing attributes for
  events that they do not own

- publishing users of the owner organisation can see, accept or discard
  them

- Reworked the access control

- minor fixes
 2013-04-25 14:04:08 +02:00
Christophe Vandeplas e9bcacfbc3 fix sanitization in Attributes #96 2013-04-24 15:20:20 +02:00
iglocska 8c0a7ad716 Double sanitization fixed 2013-03-19 15:13:07 +01:00
iglocska f008eb9f07 Search for attributes by organisation 
- New search functionality on request - restrict attributes by
  organisation

- Also, attributes in the list attributes and search attributes result
  pages, that belong to the user's organisation will have a red event ID
 2013-03-19 11:54:14 +01:00