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

1973 Commits (6ef27e41f4164a753aa12de2f9579ea5f1b32ca1)

Author SHA1 Message Date
iglocska 6ef27e41f4 Merge branch 'hotfix-2.3.16' into develop 2014-10-27 17:25:27 +01:00
iglocska 7344405ba3 Version number fixed 2014-10-27 17:25:03 +01:00
iglocska a48f752849 Merge branch 'hotfix-2.3.16' into develop 2014-10-27 17:23:12 +01:00
iglocska 035dfc8b12 Made the version check exclusive to the diagnostics tab 2014-10-27 17:21:57 +01:00
iglocska 0a7976277b Merge branch 'hotfix-2.3.15' 2014-10-27 16:52:08 +01:00
iglocska a87d88e049 Event attribute pagination is persistent through edits / deletes 2014-10-27 16:51:23 +01:00
iglocska 682923f980 Merge branch 'hotfix-2.3.14' into develop 2014-10-27 16:21:03 +01:00
iglocska 2eae0c1de0 Merge branch 'hotfix-2.3.14' 2014-10-27 16:05:14 +01:00
iglocska 6d73409b90 Version check tool added 
- check the latest tag on github and compare it to the local version
- from here on all hotfix, minor, major releases should be tagged apropriately.
 2014-10-27 16:03:43 +01:00
iglocska 8107c353cd Merge branch 'hotfix-2.3.13' into develop 2014-10-24 15:11:37 +02:00
iglocska 37a3027243 Merge branch 'hotfix-2.3.13' 2014-10-24 15:11:21 +02:00
iglocska efc580c938 Changing an attribute's field on the fly now requires a double click 2014-10-24 15:10:46 +02:00
iglocska 0ffe6f517a Merge branch 'hotfix-2.3.12' into develop 2014-10-24 14:19:10 +02:00
iglocska a7d8e17f77 Merge branch 'hotfix-2.3.12' 2014-10-24 14:18:48 +02:00
iglocska d0b441132b Fix to the capitalisation in the user index filter and fix to the scripts tmp folder not being created on git clone 2014-10-24 14:17:58 +02:00
iglocska 1c3bb7d3ea Merge branch 'hotfix-2.3.11' 2014-10-23 15:59:57 +02:00
iglocska 4fec5d041f Added missing empty file 2014-10-23 15:59:38 +02:00
iglocska f27ec74c74 Merge branch 'hotfix-2.3.11' into develop 2014-10-23 14:30:23 +02:00
iglocska cd9d1536a1 Merge branch 'hotfix-2.3.11' 2014-10-23 14:10:25 +02:00
iglocska b7da6019f1 Further work on the manual, fix to the user filter 2014-10-23 14:09:50 +02:00
iglocska fc7ca7dcbe Work on the documentation and font change 
- Adding all the new features to the documentation
- removed Robotolight from css to fix issues with chrome/firefox on Windows
 2014-10-23 11:31:07 +02:00
iglocska e1f8ee7784 Merge branch 'hotfix-2.3.10' into develop 2014-10-22 13:31:48 +02:00
iglocska a1fd3bc559 Merge branch 'hotfix-2.3.10' 2014-10-22 13:31:24 +02:00
iglocska b1a03fc584 Fix to the GFI upload 2014-10-22 13:31:03 +02:00
iglocska def146b7a5 Merge branch 'hotfix-2.3.10' 2014-10-22 13:17:22 +02:00
iglocska d1779d3fec Merge branch 'hotfix-2.3.9' into develop 2014-10-21 10:30:06 +02:00
iglocska abb0a0f15c Merge branch 'hotfix-2.3.9' 2014-10-21 10:29:38 +02:00
iglocska c8cc55b243 Fix to the filters 2014-10-21 10:29:14 +02:00
iglocska f75c6c205c Merge branch 'hotfix-2.3.9' into develop 2014-10-21 10:28:25 +02:00
iglocska e65ff8d0b1 Merge branch 'hotfix-2.3.9' 2014-10-21 10:28:08 +02:00
iglocska 2ed9c18068 Fix to the filters 2014-10-21 10:27:55 +02:00
iglocska 6ecb688cff Merge branch 'hotfix-2.3.9' into develop 2014-10-21 10:11:19 +02:00
iglocska c4f343a82f Merge branch 'hotfix-2.3.9' 2014-10-21 10:10:47 +02:00
iglocska e6e72e7f29 Fix to the filter 2014-10-21 10:10:36 +02:00
iglocska 7990595f02 Merge branch 'hotfix-2.3.9' 2014-10-21 10:08:32 +02:00
iglocska d637a6d240 Merge branch 'hotfix-2.3.8' into develop 2014-10-20 14:44:36 +02:00
iglocska 2da3c447be Merge branch 'hotfix-2.3.8' 2014-10-20 14:44:21 +02:00
iglocska 9cca7ed81a Changes to the installation 2014-10-20 14:44:03 +02:00
iglocska 29b6648ef8 Merge branch 'hotfix-2.3.7' into develop 2014-10-16 09:02:29 +02:00
iglocska 22f322f9a5 Merge branch 'hotfix-2.3.7' 2014-10-16 09:02:05 +02:00
iglocska e46a7f60e8 Added missing comment about enabling the scheduler worker fixes #295 2014-10-16 09:01:19 +02:00
iglocska 098563c533 Merge branch 'hotfix-2.3.6' into develop 2014-10-15 15:40:25 +02:00
iglocska 832000e74d Merge branch 'hotfix-2.3.6' 2014-10-15 15:40:03 +02:00
iglocska 504527d36b Fixes to the proposal ajax mechanism for newer cakephp versions 2014-10-15 15:39:28 +02:00
iglocska def639a3d7 Merge branch 'hotfix-2.3.6' into develop 2014-10-15 11:11:40 +02:00
iglocska 7c2a89765a Merge branch 'hotfix-2.3.6' 2014-10-15 11:11:23 +02:00
iglocska 8f92361d4e Copy pasta fail breaking the proposal accept button fixed, fixes #293 2014-10-15 11:10:10 +02:00
iglocska 51fa34db82 Merge branch 'hotfix-2.3.5' into develop 2014-10-15 08:54:28 +02:00
iglocska 241e944433 Merge branch 'hotfix-2.3.5' 2014-10-15 08:54:03 +02:00
iglocska 2a4141ec07 Reverted switch to InnoDB for the events table for now, fixes #292 
- fulltext indexes are not supported on mysql < 5.6 for innodb, and the default version for the current ubuntu distribution seems to be 5.5 still

Might revisit this in the future
 2014-10-15 08:52:31 +02:00