MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
25,787 Commits
34 Branches
365 Tags
188 MiB
Commit Graph

95 Commits (2.4)

Author SHA1 Message Date
Jakub Onderka c8cd908c9c fix: [acl] Add event to template when adding shadow attribute 2022-11-02 13:24:34 +01:00
Jakub Onderka 2180edeefc fix: [UI] Undefined index 2022-10-25 16:50:58 +02:00
Jakub Onderka 13d98012d9 chg: [UI] Simplify category mapping data 2022-04-25 16:52:21 +02:00
Jakub Onderka e7c1706311 chg: [UI] formInfo for add proposal 2022-04-24 16:59:58 +02:00
Jakub Onderka 27c420c6f8 chg: [UI] formInfo for propose attachment 2022-04-24 16:59:58 +02:00
Jakub Onderka cdcc96bd9c chg: [UI] Simplified generating categories that can be malware sample 2021-07-20 18:10:01 +02:00
Luciano Righetti 1bc44f5b0d fix: add type dropdown in all generic forms. 2021-06-24 16:01:56 +02:00
Jakub Onderka 700536086a fix: [UI] Remove duplicate request for quick filter 2020-10-06 14:15:17 +02:00
Jakub Onderka 9f7e697524 chg: [UI] Focus proposal when going from proposals index 2020-10-06 14:15:16 +02:00
Vito Piserchia b8c7485712 resolve merge 2020-08-16 13:31:31 +02:00
mokaddem f5b8dd687a
chg: [proposals:index] Migrated index to the factory index 2020-08-03 14:32:26 +02:00
Jakub Onderka ce89cbe19f chg: [UI] Add proposal form refactor 2020-07-24 14:01:51 +02:00
iglocska 3736192142
fix: [proposals] re-edded the edit view for propsoals 2020-07-09 13:42:40 +02:00
Jakub Onderka 0d93a45807 fix: [security] Remove ShadowAttributesController::{getProposalsByUuid,getProposalsByUuidList} 
These methods are not used, but they let sync users to access proposals for any event.
 2020-07-06 12:26:43 +02:00
Jakub Onderka df6916a312 fix: [security] Remove ShadowAttributesController::{fetchEditForm,editField} 
These methods are not used, but they allow to access attribute data without proper ACL checks.
 2020-07-06 09:08:07 +02:00
mokaddem 7797aeed94
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-final 
Not a simple merge. Needed to fix forms and simplified how
form_seen_input works
 2019-12-16 13:36:01 +01:00
mokaddem bb3cf85776
Merge branch '2.4' into zoidberg-timeline 2019-10-02 11:23:04 +02:00
iglocska c8018d7daa
new: [API] Proposal sync rework done 2019-07-12 16:03:08 +02:00
mokaddem 6af9719a47 new: [shadowAttribute] first_seen and last_seen on shadowAttributes 2019-06-24 10:28:55 +02:00
iglocska fdaf0919d3 new: [UI] Tied the index filter system into all indeces 
- WIP: Event view
 2019-02-20 23:02:02 +01:00
iglocska d8ee91be68 chg: [refactor] Side menu generic templates moved 2019-02-13 14:45:01 +01:00
StefanKelm 18c6ff0c9e
Default sort order for timesamps: desc 2018-08-07 16:07:21 +02:00
iglocska 58997b9ac1 chg: [psr-2] Changed view files to space indentation instead of tabs 
- *sniff sniff*
 2018-07-20 09:29:50 +02:00
iglocska adc0ee022f fix: Added missing switch to the new OrgImg helper for the proposal index 2018-01-19 15:57:14 +01:00
Steve Clement 2e608649df View/ShadowAttributes -> __(' 2018-01-12 11:32:49 +01:00
Steve Clement 369fb4c10f Merge remote-tracking branch 'origin' into i18n_prep 2018-01-08 15:10:05 +01:00
iglocska 115f7d4592 fix: Fixed default to_ids setting for proposal edits (should reuse old setting) 2018-01-08 09:05:39 +01:00
Steve Clement 1b9d39957b - __(' added where needed 2018-01-05 17:01:14 +01:00
iglocska ead2b9e1fd fix: Various fixes 2017-08-10 11:11:33 +02:00
Ángel González 926895733b Cosmetic changes 
Change space indents to tabs
Remove ?> at end of file
Add or remove some indentation where appropriate
 2017-05-08 00:45:57 +02:00
iglocska e637bb5118 chg: Further work on the accessibility changes 2017-03-14 17:12:35 +01:00
iglocska 718a3381fb fix: First round of Accessibility issues resolved with span links 2017-03-11 17:31:38 +01:00
Richard van den Berg 860dd8b686 Use 24 hour clock 2016-12-13 13:59:11 +01:00
Iglocska 88b1fa52be chg: Changed the behaviour of the proposal index 
- choose between own events / all visible events
- show timestamps on the proposal index and the creator org of the event
 2016-11-22 11:48:15 +01:00
Iglocska 1345d1a248 new: Added timestamps of shadow attributes wherever appropriate 2016-11-22 11:16:50 +01:00
Iglocska 97c43c6c9e new: Rework of the attribute/proposal views and popovers round 2 
- also fixes to a bunch of small UI bugs and code style issues
 2016-10-02 12:46:30 +02:00
Andreas Ziegler 1d06f25b38 chg: add newline character before EOF to non-minified (text-)files 2016-06-06 10:09:55 +02:00
Andreas Ziegler 7cadf8340c remove space after unset before opening brace 2016-06-04 15:45:57 +02:00
Andreas Ziegler 985451642e add space after keywords if/for/foreach/while/switch/catch 2016-06-04 15:45:39 +02:00
Andreas Ziegler 0fe692c56a remove whitespace at end of line 2016-06-04 01:10:45 +02:00
Andreas Ziegler bba7e60e85 remove empty lines at end of files 2016-06-04 01:10:05 +02:00
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska dbe2d4a8c0 Fixed Proposal naming, fixes #1034 2016-03-22 15:04:39 +01:00
Iglocska a9c07371ca Fixes to the proposal system 
- proposals were not synchronised during pulls due to a bug
  - affects both 2.3 and 2.4, the bug comes from the switch to json
  - missing JSON view for proposal interface
  - Also, 2.4->2.4 the organisation objects were incorrectly ommited from the sync
  - Fixes:
    - reverted back to XML for the old style proposal exchange
    - 2.3->2.4 is now fixed
    - 2.4->2.4 below 2.4.7 version will still not synchronise proposals on pull

- Proposal pull reworked
  - requires 2.4.7 on both ends or higher
  - proposals are now synced in one go
  - massive increase in speed and reduction of log entries

- Proposal e-mailing reworked
  - tied into the new 2.4 e-mailer, which was left out on 2.4's release by accident
  - triggers correctly now when a proposal is added (also on pull)
 2016-01-14 02:46:10 +01:00
Iglocska 30945dacd2 double comment field fixed 2015-12-18 17:20:56 +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 fbd97df3ac Several fixes, among others fixes #748 
- Double sanitisation when edditing an attribute/proposal comment removed
- Fixed an issue where an ip/resource was recognised as a CIDR notation IP range instead of a url
- Changed the flash message for publishing without e-mails to something less scary
 2015-12-08 15:12:13 +01:00
Iglocska 5dbbe84069 Merge branch 'master' into 2.4-beta 
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ShadowAttributesController.php
	app/Model/Event.php
	app/View/Elements/side_menu.ctp
 2015-11-30 09:37:22 +01:00
iglocska 72db1ab211 Left off the view file from the previous commit 2015-11-26 17:13:01 +01:00
iglocska 332d5fa666 Reverted the sanitisation of the baseurl variable on the view level 
- sanitising it in appcontroller instead
 2015-11-17 01:17:10 +01:00