MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
1,746 Commits
58 Branches
373 Tags
196 MiB
Commit Graph

1746 Commits (7b3f5780252ac37397798523ca225979f4b381e1)

Author SHA1 Message Date
iglocska 7b3f578025 Further work on the templating system 2014-06-12 13:59:54 +02:00
iglocska f4e5c22865 Work on the templating system 
- create a basic template
- add text elements to the template
- rearrange elements
 2014-06-10 15:18:49 +02:00
iglocska 19b4a2ae37 Fixes to several ajax related issues 
- malware samples / attachments couldn't be downloaded
- links weren't actually links

- deleting an attribute / shadowattribute now opens a custom confirmation dialogue. This is also where the CSRF tokens are generated for the post request to execute the delete, resulting in a faster event view load
 2014-05-09 23:12:51 +02:00
iglocska ef07046739 Fix to several permission issues 2014-05-07 17:16:19 +02:00
iglocska be9196c339 Merge branch 'hotfix-2.2.30' into develop 2014-05-06 17:11:40 +02:00
iglocska 83315ac70a Attributes not edited correctly when pushing an edit through REST api if the event came from a manual export 
- fixed
 2014-05-06 17:10:30 +02:00
iglocska aca5225a06 Merge branch 'hotfix-2.2.29' into develop 2014-05-06 16:02:11 +02:00
iglocska 24c3464d22 Merge branch 'hotfix-2.2.29' 2014-05-06 16:01:55 +02:00
iglocska d56ca766e8 Fixed a copy paste fail in the previos commit 2014-05-06 16:01:31 +02:00
iglocska 77c578ea8e Merge branch 'develop' of https://github.com/MISP/MISP into develop 2014-05-06 15:23:49 +02:00
iglocska 35ba964354 Merge branch 'hotfix-2.2.29' into develop 2014-05-06 15:23:24 +02:00
iglocska 7276d032e4 Merge branch 'hotfix-2.2.29' fixes #259 2014-05-06 15:22:49 +02:00
iglocska 5f5369e930 Better feedback from edits to events failing via REST api. 
- also, site admins can edit events regardless of who the orgc is via the REST api.
 2014-05-06 15:21:52 +02:00
iglocska edc5605e09 Nicer way of resizing activated fields 2014-05-06 11:01:42 +02:00
iglocska ba751a0662 Merge branch 'hotfix-2.2.28' into develop 2014-05-06 10:47:12 +02:00
iglocska 24b9c4d29e Merge branch 'hotfix-2.2.28' 2014-05-06 10:46:29 +02:00
iglocska 2c72b129a5 Update to the installation instructions (fixes #257) and the 2.2 upgrade script 
- fixed 2 incorrect entries in the installation.txt file

- fixed an incorrect variable name in the 2.2 event upgrade script
 2014-05-06 10:44:53 +02:00
iglocska 62987fc667 Merge branch 'hotfix-2.2.27' into develop 2014-05-06 08:53:43 +02:00
iglocska 41ee2d73bd Merge branch 'hotfix-2.2.27' 2014-05-06 08:53:23 +02:00
iglocska 8f3fc159fb Events directly exported from MISP and imported to another instance failed on edit, fixes #259 
- Events exported were enclosed in a <response> tag, which the sync automatically filters out, but a manual export and import would fail on edits

- added a conditional that removes the <response> tag if an event is encapsulated in a request to the edit method
 2014-05-06 08:51:29 +02:00
iglocska 596c9809bb Merge branch 'hotfix-2.2.26' into develop 2014-05-05 17:14:40 +02:00
iglocska 9ceeb5126f Merge branch 'hotfix-2.2.26' 2014-05-05 17:14:14 +02:00
iglocska 0016f448bf Update to the installation instructions, fixes #257 2014-05-05 17:13:42 +02:00
iglocska de36f83677 Merge branch 'hotfix-2.2.25' into develop 2014-05-05 12:14:01 +02:00
iglocska af31b78f4d Merge branch 'hotfix-2.2.25' 2014-05-05 12:12:49 +02:00
iglocska 04e7220936 Fixed an issue with an incorrect timestamp comparison for attributes, allowing the update of an attribute with an older version 2014-05-05 12:12:02 +02:00
iglocska e7a5ccc477 Merge branch 'features/ajaxification' into develop 2014-05-05 10:27:04 +02:00
iglocska 0484edaab4 Another small permission fix 2014-05-05 10:26:16 +02:00
iglocska fca948e8c5 Merge branch 'features/ajaxification' into develop 2014-05-05 10:18:09 +02:00
iglocska ac02ad7884 Nicer fix for the previous issue 
- since checkboxes weren't working for site admins
 2014-05-05 10:17:11 +02:00
iglocska da2bfd9268 Merge branch 'features/ajaxification' into develop 2014-05-05 10:14:33 +02:00
iglocska ea5b4c4468 Fix to site admins not being allowed to edit attributes 2014-05-05 10:13:40 +02:00
iglocska 2ebe09bd27 Merge branch 'features/ajaxification' into develop 2014-05-05 09:57:37 +02:00
iglocska 291892be05 Merge branch 'develop' into features/ajaxification 
Conflicts:
	app/View/Elements/img.ctp
 2014-05-05 09:56:42 +02:00
iglocska 8dc797dc39 Clearer disctinction between proposals that belong to an attribute and proposals to an event 2014-05-02 15:19:15 +02:00
iglocska 14976bd7bb Ajaxification of the event page done also, replaced histogram in memberslist 
- AJAX requests now also respond with a small message at the bottom of the page, notifying the user of the result
- The following actions work now on the event page via ajax:

1. Add / remove tags
2. quick edit any attribute field if eligible
3. quickly create a proposal of any attribute field if not eligible to edit
4. popover attribute creation (also works with batch add)
5. popover proposal creation (also works with batch add)
6. delete attributes
7. accept/discard proposals
8. mass edit / delete attributes

Also, replaced the old memberslist, with a small lightweight css/js based one.
 2014-05-02 14:29:15 +02:00
iglocska 4b31c3c497 Merge branch 'hotfix-2.2.24' into develop 2014-04-30 11:01:05 +02:00
iglocska 162389c4c8 Merge branch 'hotfix-2.2.24' 2014-04-30 11:00:40 +02:00
iglocska dac1c2b17c CSV export now includes date for each attribute, fixes #255 2014-04-30 11:00:20 +02:00
iglocska 9b0421979f Merge branch 'hotfix-2.2.23' into develop 2014-04-28 14:51:53 +02:00
iglocska 123ba4f8c3 Merge branch 'hotfix-2.2.23' 2014-04-28 14:51:20 +02:00
iglocska 8bb47c863d Incorrect default timeout value fixed in core.php 2014-04-28 14:50:47 +02:00
iglocska 303de0e3aa Further work on the ajaxification 
- mass deletes / mass edits

- tagging now done via ajax

- also, several small unrelated issues fixed
 2014-04-24 15:10:08 +02:00
iglocska f3bca2cdb0 Merge branch 'hotfix-2.2.22' into develop 2014-04-22 10:39:42 +02:00
iglocska 1c9b621654 Merge branch 'hotfix-2.2.22' 2014-04-22 10:38:49 +02:00
iglocska 9640dcd4ed Automation authentication via header fixes #254 
- Authentication via headers was only allowed if _isRest() returned true
- this only happened for pages returning JSON or XML content

- a new check, _isAutomation() was added that allows authentication via headers for certain methods used by the automation system
 2014-04-22 10:36:37 +02:00
iglocska c88bfc11b2 Rework of the way the ajax editing works 
- forms are now dynamically pulled onclick
- performance greatly enhanced
- solves the issues with the CSRF protection kicking in if the user edits a field after using the back button
 2014-04-17 11:44:40 +02:00
iglocska 979bb370e7 next step in the ajaxification 
- multiselect / multidelete
- some additional UI changes for the event view
 2014-04-16 15:52:25 +02:00
iglocska 9ff83d5056 Merge branch 'hotfix-2.2.21' into develop 
Conflicts:
	app/Controller/AttributesController.php
 2014-04-15 17:11:12 +02:00
iglocska 148a1e20a6 Merge branch 'hotfix-2.2.21' 2014-04-15 16:58:03 +02:00