MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
2,156 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

2156 Commits (5abd8dfeadacc8817bda44aac18408d86981f891)

Author SHA1 Message Date
iglocska 5abd8dfead Further work on the sharing groups: 
- changes to the data model
- correlation engine updated
 2015-04-09 17:27:34 +02:00
iglocska 9ccf69f35a User edit fixed 
- choose organisation from a list as expected
- fixed refreshauth
 2015-04-08 13:10:52 +02:00
iglocska fcaccb1784 Update to the roles and user filtering 
- new role permission added for SG editors
- roles reworked, permissions all looked up centrally from the role model instead of code replication across controllers and views
- user filtering now correctly uses organisation objects instead of org strings
 2015-04-07 14:47:14 +02:00
iglocska 1afa15120f Further work on the sharing groups 2015-04-07 00:24:44 +02:00
iglocska f7f200deb8 Further progress 2015-03-21 14:27:53 +01:00
iglocska 29a6f10048 Merge branch 'master' into feature/sg 
Conflicts:
	app/webroot/js/ajaxification.js
 2015-02-23 11:38:54 +01:00
iglocska 3c4617c9ca Removed debug line 2015-02-23 11:37:13 +01:00
iglocska bdc6b5fa8f Initial commit 2015-02-23 11:33:38 +01:00
iglocska f905b8457d Merge branch 'hotfix-2.3.53' 2015-02-23 10:40:27 +01:00
iglocska baf4d03aab Version bump 2015-02-23 10:40:11 +01:00
iglocska 8dad666b38 Disabled the animation in the MISP logo 
- it was quite heavy on CPU usage and it was too subtle to notice anyway
 2015-02-20 11:11:00 +01:00
iglocska 4239edffc9 Org admins editing privileged users demotes the privileged user to a lower permission level, fixes #408 
- an org admin now correctly can select the previously assigned privileged role for a user that he/she is editing
 2015-02-20 09:17:25 +01:00
iglocska c770347828 Merge branch 'hotfix-2.3.52' 2015-02-18 11:51:39 +01:00
iglocska d9c4ca2f4c Version bump 2015-02-18 11:51:05 +01:00
iglocska 6782159b53 API search incorrectly generating JSON with several events, fixes #407 
- also fixed the edit button on the index
 2015-02-18 11:45:15 +01:00
iglocska c320cf1805 Merge branch 'hotfix-2.3.51' 2015-02-16 17:35:35 +01:00
iglocska 54626d9378 Version bump 2015-02-16 17:34:58 +01:00
iglocska 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
iglocska 3c3e36781e Merge branch 'master' of https://github.com/MISP/MISP 2015-02-16 14:49:18 +01:00
iglocska 27334ec7e2 Merge branch 'hotfix-2.3.50' 2015-02-16 14:47:55 +01:00
iglocska fbca80d680 Added more contextual info for the CSV exports, fixes #391 2015-02-16 14:47:21 +01:00
iglocska b5be1a36fb Correlation disabled for http-method, fixes #406 2015-02-16 13:30:15 +01:00
iglocska eed95b1129 Missing json view file added 
- return attributes fails when requesting the results in JSON
- added missing view file
 2015-02-16 13:14:05 +01:00
Alexandre Dulaunoy 3298ad4bcd Fix pull #400 2015-02-16 10:58:41 +01:00
Alexandre Dulaunoy 28865d6882 MISP logo added 2015-02-16 10:15:42 +01:00
Alexandre Dulaunoy 218d8ee45d MISP logos added (SVG, PDF and PNG) 2015-02-16 10:12:08 +01:00
iglocska 32ea0ef520 Merge branch 'hotfix-2.3.49' 2015-02-16 09:00:49 +01:00
iglocska 54a86732e4 Relaxed the auth key requirement for nids exports 
- incorrect check on the nids exports blocked logged in users from downloading the snort/suricata rules of an event
- check removed
 2015-02-16 08:59:53 +01:00
iglocska 9e1beadad0 Merge branch 'hotfix-2.3.48' 2015-02-10 14:44:54 +01:00
iglocska f9f36d60e1 Version bump 2015-02-10 14:44:44 +01:00
iglocska 701160acd9 Fixed an issue with the free-text import failing on more than ~100 parsed values, fixes #389 
- Caused by a 1k variable / form limit imposed by php since 5.3.9
- Form data now collected by JS and passed as a single JSON in the POST request
- Allows massive IOC lists to be imported
- improved performance
 2015-02-10 14:42:24 +01:00
iglocska d89a266c85 Merge branch 'hotfix-2.3.47' 2015-02-09 11:07:44 +01:00
iglocska 9378837f39 Documentation changes 2015-02-09 11:07:18 +01:00
iglocska 19dac1faaf Merge branch 'hotfix-2.3.46' 2015-02-05 17:26:51 +01:00
iglocska 12d7025bce Patch fixing json download, fixes #387 
- World's smallest patch
 2015-02-05 17:25:40 +01:00
iglocska 9cc7a994c3 Merge branch 'hotfix-2.3.45' 2015-02-05 10:14:41 +01:00
iglocska c3481cbf0f New documentation left off 2015-02-05 10:14:27 +01:00
iglocska 7f54081a55 Merge branch 'hotfix-2.3.45' 2015-02-05 10:13:09 +01:00
iglocska 9c999ab59c Version incremented 2015-02-05 10:12:55 +01:00
iglocska 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
iglocska a3f84db8b0 Merge branch 'hotfix-2.3.44' 2015-02-04 11:07:54 +01:00
iglocska b475e1d2e6 Version incremented 2015-02-04 11:07:40 +01:00
iglocska 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 4cf09a201c Merge branch 'hotfix-2.3.43' 2015-02-03 21:53:39 +01:00
iglocska 8c30115f12 Documentation fail fixes #384 2015-02-03 21:53:03 +01:00
iglocska 7e59d7f14f Merge branch 'hotfix-2.3.42' 2015-02-03 17:30:59 +01:00
iglocska fddb06b3c2 Small change to the XML export 
- won't write to file after all, simply keeps adding to a string in memory. Should still resolve the XML conversion taking up high amounts of memory issue.
 2015-02-03 17:29:46 +01:00
iglocska f0aa849d04 Various improvements to the exports 
- Unified the way exports accept negated parameters
- Fixed the documentation
- Most exports are now restrictable by the event date (From/To parameters)
- none cached XML export now writes to file after converting each event, clearing the memory and resolving any potential memory issues
 2015-02-03 17:06:05 +01:00
iglocska 9b20a0a4a9 Merge branch 'hotfix-2.3.41' 2015-02-02 13:20:21 +01:00
iglocska 98f65aae09 Merging several pull requests and a few other changes 
- Pull request by RichieB2B: CentOS 6 & 7 installation instructions
- Pull request by RichieB2B: STIX exports now include comments for indicators
- Pull request by RichieB2B: Issue fixed with md5 type attributes not generating observables correctly during a STIX export
- Password policy change-able by a site admin via a regex and a min char requirement. Old functionality assumed if not set.
- bug fixed with incorrect jobs being created appearing during a scheduled pull (designates a push)
- slight changes to the installation instructions
- database.default.php now uses localhost instead of 127.0.0.1 and the default MySQL port
 2015-02-02 13:12:15 +01:00