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

3196 Commits (eeb3dcc69b8ca10c82d8646bea1696966f47b060)

Author SHA1 Message Date
Iglocska eeb3dcc69b Replaced the footer text 
- added link to the github page of MISP
- made the text "Powered by MISP vversion_number" fixed
- Replaced the surrounding text fields with two new fields (empty by default)
 2016-01-17 21:22:50 +01:00
Iglocska be31148018 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-16 23:13:03 +01:00
Iglocska 1746c0f902 Replaced encoded copyright sign with the sign itself to avoid the double encoding in the footer, fixes #853 2016-01-16 23:12:10 +01:00
Raphaël Vinot 85ce720d15 Merge pull request #856 from rotanid/patch-1 
Update INSTALL.ubuntu1404.txt
 2016-01-16 07:51:56 +01:00
Andreas Ziegler 1ea49bf9cc Update INSTALL.ubuntu1404.txt 
Debian 7 (Wheezy) is oldstable since April 2015
 2016-01-15 21:31:08 +01:00
Iglocska 0eb1a0baa4 Reverted a change that leads to the pull failing 2016-01-15 19:44:18 +01:00
Andras Iklody cd7d5270fb Merge pull request #854 from RichieB2B/centos-docs 
Update CentOS documentation
 2016-01-15 15:57:46 +01:00
Richard van den Berg 5b3de13553 CentOS 7 needs chmod +x /etc/rc.local 2016-01-15 15:45:18 +01:00
Richard van den Berg 1daa7113bf Restart php-fpm after redis install 2016-01-15 15:23:34 +01:00
Richard van den Berg a23027eee4 Updated MISP 2.4 INSTALL instructions for CentOS 6 2016-01-15 15:06:48 +01:00
Richard van den Berg cf67ef09ce Updated MISP 2.4 INSTALL instructions for CentOS 7 2016-01-15 12:47:13 +01:00
Iglocska 98c1aadfa4 Fix to a bug allowing regular users of the owner organisation to edit/delete a synced event as discovered by @h122015 
- requirements for the actions changed from an org_id match to an orgc_id match
 2016-01-15 11:43:37 +01:00
Iglocska 3b22997240 Fix to a bug that caused taxonomies to create duplicates instead of updating an older version 2016-01-15 11:05:17 +01:00
Alexandre Dulaunoy ee9107cc1f MISP taxonomies sub-module updated 2016-01-15 10:36:21 +01:00
Alexandre Dulaunoy 86ba2f2afe Feature request via feathub added 2016-01-14 23:06:49 +01:00
Iglocska 1d089acc5b Fix to an issue with the quickfilters not working, fixes comment by ztormhouse 
- invalid search on the org field, a remnant from 2.3
- didn't cause exceptions on migrated issues as the field isn't removed post upgrade
- throws an exception on fresh installations

- fix now correctly looks up organisation names matching the entered string and uses the result set to filter the events
 2016-01-14 21:23:55 +01:00
Iglocska f04fbe3109 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-14 19:47:21 +01:00
Iglocska e85282c878 Fix to an invalid data entry pre-validation call that broke prtn attribute entry with a leading + 2016-01-14 19:46:35 +01:00
Alexandre Dulaunoy a5cadeea71 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2016-01-14 17:23:08 +01:00
Alexandre Dulaunoy 4a8f3c1245 MISP toolbar logo (CC-BY) 2016-01-14 17:22:36 +01:00
Raphaël Vinot 077cc43a56 Merge pull request #847 from Rafiot/add_csv_test 
Test CSV download
 2016-01-14 14:59:28 +01:00
Raphaël Vinot 375c015b76 Test CSV download 2016-01-14 14:48:00 +01:00
Iglocska 08ae212196 Version bump 2016-01-14 02:53:34 +01:00
Iglocska 9ed006bb51 Merge branch 'feature/proposalFix' into 2.4 2016-01-14 02:53:06 +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 aab2752cbe Sort orgs alphabetically in user index filters 2016-01-13 15:56:59 +01:00
Iglocska a1f0a88707 Fixed missing validation for malware-type type attributes 2016-01-13 13:49:57 +01:00
Iglocska d04e583dd6 Order attributes by UUID for the CSV export, fixes #849 2016-01-13 11:35:25 +01:00
Iglocska aff8bee4fb Further fix to the previous commit affecting the log search 
- only show the subset of valid model options for the log search that would yield results based on the current dataset
 2016-01-13 08:40:18 +01:00
Iglocska 4b20cf8124 Fixed an issue with searching the logs by model where incorrect model entries would also show up as options 2016-01-13 08:36:14 +01:00
Iglocska 953a83a9e0 Several changes to the logs 
- index now shows the model that the log entry concerns
- added model to the search parameters
  - this allows for searches such as new users added (Model:User - action:add)

- fixed a bug with the log search where going back to the first page of results would return you to the search form
 2016-01-12 19:49:01 +01:00
Iglocska e4ffbca3e1 Added purpose of UPDATE.txt 2016-01-12 19:48:07 +01:00
Iglocska f9d60d1b2c Small fix to the contact users form for org admins 2016-01-12 15:36:58 +01:00
Iglocska 32eddc34a7 Fixed a double slashed path in the writeable dir diagnostics 2016-01-12 15:18:49 +01:00
Iglocska 17c09157a1 Fixed an issue where single event exports would fail 
- event id not stored in the events array from the passed parameters
 2016-01-12 12:29:55 +01:00
Iglocska 1caebfe1a0 Check permissions on config files, fixes #837 
- red warning on the settings page if the config.php file is not writeable
- failed changes in settings due to the config.php file not being writeable logged
 2016-01-12 10:44:06 +01:00
Iglocska 710828d397 Some small changes to the diagnostics 
- made the PHP settings check look a bit more clear and changed it from failures to recommendations

- added a file permission check for config.php (can add more in the future such as the background worker log files which can prevent the workers from starting)
 2016-01-12 00:19:06 +01:00
Iglocska 47d3eba9e0 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-11 23:52:36 +01:00
Iglocska bad00e9c2d Add check for values on diagnostics page, fixes #839 2016-01-11 23:52:09 +01:00
Raphaël Vinot 63a6e3b579 Make sure the perms are right after the upgrade 2016-01-11 16:12:46 +01:00
Raphaël Vinot 872ad3df6a Merge pull request #840 from Rafiot/2.4 
Merge PR #679, add more php version in the travis runs.
 2016-01-11 12:23:29 +01:00
Raphaël Vinot 227d2cc95e Add php 5.5 and 7.0 in the travis tests 2016-01-11 12:13:28 +01:00
Raphaël Vinot 8505b54a07 Merge branch 'pr/679' into 2.4 2016-01-11 12:09:55 +01:00
Iglocska aa5eb55a84 Updated an outdated upgrade procedure for cakephp in UPDATE.txt 
- as described in #833
 2016-01-10 20:06:31 +01:00
Iglocska 5817b54c08 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-10 19:57:58 +01:00
Iglocska 176ad85b88 Rework of the scheduled caching jobs 
- fixed a series of issues with the exports
 2016-01-10 19:45:33 +01:00
Iglocska 26abe7e901 Changes to the organisations table in the upgrade script 
- matches the changes made to the MYSQL.sql
- makes contextual fields nullable
 2016-01-09 22:12:47 +01:00
Iglocska 6bf683cac6 FIxed several issues 
- some performance tuning for the restSearch API
- fixed an issue where overriding the contain parameters in the attribute fetcher would lead to an exception
- fixed an issue where accepting a proposal would try to copy the sharing group of the event incorrectly (it now simply gets set to inherit event)
- fixed an issue with the rest search API failing when some fields were not set
 2016-01-08 11:10:02 +01:00
Iglocska 2e915500d8 Add org of proposal creator to the event view 2016-01-07 18:09:32 +01:00
Iglocska 5306351c00 Added proposals to the event view attribute filters and fixed some descriptions, fixes #828, fixes #827, fixes #821 2016-01-07 17:53:22 +01:00