9b7191f878
fix: Don't show the org restriction of a tag in the event view JSON
2016-09-27 09:38:32 +02:00
1d06f25b38
chg: add newline character before EOF to non-minified (text-)files
2016-06-06 10:09:55 +02:00
7cadf8340c
remove space after unset before opening brace
2016-06-04 15:45:57 +02:00
985451642e
add space after keywords if/for/foreach/while/switch/catch
2016-06-04 15:45:39 +02:00
0fe692c56a
remove whitespace at end of line
2016-06-04 01:10:45 +02:00
898ea1d97c
remove whitespace (space/tab) from empty lines
2016-06-04 01:08:16 +02:00
2b1d352073
fix: resolved commented out request type checks, fixes #1141
2016-05-19 08:33:33 +02:00
f4b7c101e5
chg: Attribute search download also offered as JSON, fixes #1035
...
- also added some convenience functions for JSON/XML collections in the appropriate export tools
- can start reusing them in other functionalities
2016-05-02 10:31:40 +02:00
3c98d3fa9b
JSON structure inconsistencies and bug, fixes #1065
2016-04-08 16:47:22 +02:00
bb372c5f7e
Better sanitisation of the XML exports
2016-04-07 14:30:00 +02:00
d433618c71
Also, enabled the filtering on pull
...
Merge branch 'master' into 2.4-beta
Conflicts:
VERSION.json
app/Controller/EventsController.php
app/Lib/Tools/XMLConverterTool.php
app/Model/Event.php
app/Model/Server.php
2015-12-03 00:27:56 +01:00
268c7683a0
Rework of the event add/edit
...
- allows for saving an event even if an attribute fails
- logs attributes that fail validation
- same for edit
- add_misp_export updated with the above in mind
2015-12-01 15:39:12 +01:00
db359170f6
some left over merging issues among other things
2015-11-17 22:01:22 +01:00
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
053c27ae9a
Removed a crappy solution to an issue with attributes being overwritten that was fixed a long time ago correctly on data entry
2015-11-16 19:51:38 +01:00
ef1d3949e7
Merge branch 'master' into feature/sg
...
Conflicts:
VERSION.json
app/Controller/ShadowAttributesController.php
app/Lib/Tools/JSONConverterTool.php
app/Lib/Tools/XMLConverterTool.php
app/Model/User.php
app/View/Elements/eventattribute.ctp
2015-10-22 09:59:00 +02:00
61e865956b
Fixes to several issues, fixes #693
...
- Fixed a critical bug in the XML export
- As of recently XML exports include relations as they were missing before
- the sanitisation of the event info field in related attributes was incorrectly sanitized of unicode characters
- this can lead to the XML export breaking and also for affected events to be blocked from synchronisation
- Proposal fixes
- fixed an invalid uuid generation that lead to an exception
- fixed the attachments for proposals still using the old attachment system that disallows most filenames
- added the automatic creation of hashes for attachment proposals
2015-10-21 23:44:07 +02:00
7fab2ce2be
Added the attribute relations to the XML / JSON output, fixes #687
2015-10-15 17:39:17 +02:00
656a391223
Progress on the sync
...
- pull from 2.3 -> 2.4 should work correctly now
2015-09-21 14:55:40 +02:00
cb435a82bf
Merges
2015-07-08 14:48:30 +02:00
f1a5ba52e5
Merge branch 'master' into feature/sg
...
Conflicts:
VERSION.json
app/Lib/Tools/XMLConverterTool.php
app/Model/Event.php
2015-07-08 14:02:54 +02:00
6a25471ea4
Fix to an error with very large strings in an array causing a failure in the XML conversion of simpleXML, fixes #500
...
Moved the XML conversion in restfullEventToServer() to MISP's own xml conversion tool
2015-07-08 10:37:20 +02:00
51ea9c090d
Further progress
2015-04-18 07:53:18 +02:00
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
b163164450
Further work on the sharing groups
2015-04-13 17:52:04 +02:00
28069a0a0f
Further work and some cleanup
...
- decision to be revised: exports don't expose Sharing groups / org uuids to users unless they are admin (for the future: at least sync users have to be added for the new sync)
2015-04-13 16:20:21 +02:00
5f70207051
Progress in moving all exports to the new distribution system
2015-04-13 12:42:26 +02:00
0dd8318fb3
Further work on the exports
...
- Performance improvements for the event search exports
- JSON view code moved to Lib
- Fixed an issue that didn't restrict the dates correctly with the from / to parameters
2015-02-16 17:31:32 +01:00
2aa902cd4b
Removed the old documentation, fixes #378 and some small fixes
...
- resolved an issue of warnings being generated when an event without attributes / relations gets XML exported.
- added new dump of the documentation
2015-02-05 10:11:29 +01:00
2401cedfdc
Left off file in previous hotfix added
...
- added a file that was not pushed during the last hotfix
- some improvements to the XML export to lower memory usage
2015-02-04 11:06:41 +01:00
Iglocska