MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
1,957 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

1957 Commits (d0b441132bb8c9a5437eb913132311c556fdce57)

Author SHA1 Message Date
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 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 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
iglocska a0591aeddb Merge branch 'hotfix-2.3.4' into develop 2014-10-14 14:30:06 +02:00
iglocska fddc089647 Merge branch 'hotfix-2.3.4' 2014-10-14 14:29:38 +02:00
iglocska dcc028516d Further improvements to the freetext regex to remove unprintable chars 2014-10-14 14:29:06 +02:00
iglocska 1dafa156fc Merge branch 'hotfix-2.3.4' into develop 2014-10-14 10:59:50 +02:00
iglocska cfcc54c061 Merge branch 'hotfix-2.3.4' 2014-10-14 10:59:38 +02:00
iglocska 53d295868f Remove non printable characters from free text import 2014-10-14 10:59:12 +02:00
iglocska b720247d57 Merge branch 'hotfix-2.3.4' into develop 2014-10-13 17:47:01 +02:00
iglocska 3a5d392014 Merge branch 'hotfix-2.3.4' 2014-10-13 17:43:55 +02:00
iglocska c7ec328fcf Better split on linebreaks for the freetext import 2014-10-13 17:43:31 +02:00
iglocska e3217a67d5 Merge branch 'hotfix-2.3.4' into develop 2014-10-13 13:52:23 +02:00
iglocska b8c7035aa9 Merge branch 'hotfix-2.3.4' 2014-10-13 13:51:41 +02:00
iglocska de4ec4885a Fix to the previous patch 2014-10-13 13:51:27 +02:00
iglocska 7f75de4da0 Merge branch 'hotfix-2.3.4' into develop 2014-10-13 13:49:13 +02:00
iglocska e23de0bdca Merge branch 'hotfix-2.3.4' 2014-10-13 13:48:55 +02:00
iglocska 1abfe6120d Fixes issues with the event filters 
- tags not filtered correctly
- status bar showing current filters now shows actual strings for tags / analysis / distribution / threat level instead of the IDs
 2014-10-13 13:47:58 +02:00
iglocska 49e50adc66 Merge branch 'hotfix-2.3.3' into develop 2014-10-13 10:50:38 +02:00