MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
4,709 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

4709 Commits (15dd363a9cae94515fc6e0d72264021bc58df197)

Author SHA1 Message Date
Andreas Ziegler 15dd363a9c chg: remove obsolete files 2016-09-24 23:35:54 +02:00
Andreas Ziegler 50744b04f7 chg: update deb8/ubu1604 setup, composer to 1.2.1 (#1569) 2016-09-24 23:34:49 +02:00
Iglocska 690dbf91bd fix: The server add view incorrectly allowed the internal server settin to be set even if the default organisation picked wasn't the host organisation 2016-09-24 13:53:42 +02:00
Iglocska daecf4aceb fix: Hide the salt key in the UI unless it's the old default key, fixes #1566 2016-09-23 15:33:29 +02:00
Iglocska eb33152e0c fix: No tag set in the remote index leads to notice errors 2016-09-23 15:22:33 +02:00
Iglocska b56ba03a83 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-09-23 15:18:02 +02:00
Iglocska f7c347f9a4 fix: sort server preview events by timestamp, fixes #1558 2016-09-23 15:17:01 +02:00
Alexandre Dulaunoy b8d275bfba Merge pull request #1567 from ppanero/shibbsso 
default org changed to id instead of name
 2016-09-23 15:04:12 +02:00
ppanero bfca484c2a default org changed to id instead of name 2016-09-23 14:34:20 +02:00
Iglocska ec99b71bf4 fix: Don't try to show sightings count if sightings aren't enabled 2016-09-23 10:39:31 +02:00
Iglocska 497bda7746 new: add the sightings cont to the event index 2016-09-23 10:35:08 +02:00
Iglocska df128fd666 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-09-23 10:33:13 +02:00
Iglocska 1006c109d7 fix: restrict tag usage for restricted tags in a place where it was missed 2016-09-23 10:32:17 +02:00
Andras Iklody 82fde24a3a Merge pull request #1559 from rotanid/bugfixes 
Bugfixes
 2016-09-23 06:52:25 +02:00
Andreas Ziegler ce1c97925d fix: missing return keyword before a message-string 2016-09-23 04:38:01 +02:00
Andreas Ziegler e5151b03fd fix: PostgreSQL handling in __dropIndex() 2016-09-23 04:38:01 +02:00
Andreas Ziegler 20accc7cdd fix: dropIndex before adding indexes on tags/org_id & cake_sessions/expires 
to make sure they are created from scratch
 2016-09-23 04:38:01 +02:00
Andreas Ziegler a6e93d6020 chg: update cakephp to 2.8.9 (#1560) 2016-09-23 04:36:26 +02:00
Alexandre Dulaunoy e8a2a0fc22 Merge pull request #1382 from treyka/patch-2 
Add install procedure for current version of ZeroMQ
 2016-09-23 00:07:47 +02:00
Alexandre Dulaunoy 43aae2e39b Chg: MISP taxonomies updated to the latest version 2016-09-22 15:15:59 +02:00
Iglocska 09b05aaaaa fix: don't load relations when running the password shell 2016-09-22 11:45:00 +02:00
Iglocska 44a9f23119 fix: Removed left in debug line 2016-09-22 09:44:51 +02:00
Iglocska 5cefaa8415 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-09-22 09:36:29 +02:00
Iglocska 2027dd83b1 fix: Force order of the regex entries 2016-09-22 09:35:21 +02:00
Andras Iklody 43d4d04028 Merge pull request #1551 from rotanid/bugfixes 
Bugfixes & Cleanup
 2016-09-21 07:35:57 +02:00
Andreas Ziegler d92c5e20a3 chg: set var eventIDs only if necessary 2016-09-21 03:20:22 +02:00
Andreas Ziegler bb8b93c7cb chg: html input text element should not have a separate closing elem 2016-09-21 02:09:39 +02:00
Andreas Ziegler 4a34ffe33e fix: append text to variable (as originally intended) 
without this change, the text won't be used or display ever
 2016-09-21 02:08:54 +02:00
Andreas Ziegler e137e2f4e7 chg: remove obsolete count variable 2016-09-21 02:06:48 +02:00
Andreas Ziegler 7dae6c9c23 fix: add keyword 'new' to an exception throw 2016-09-21 02:06:26 +02:00
Andras Iklody e0594957d4 Merge pull request #1550 from rotanid/mysql-postgresl-too 
chg: Default roles all have API access
 2016-09-20 17:55:21 +02:00
Andreas Ziegler b3ce62e168 chg: Default roles all have API access 
- changed the default role set to have api access enabled
- existing installations not affected
- if a community wants to restrict API access for certain users they're free to do it

(same as aa03830643 but for postgres this time)
 2016-09-20 17:41:30 +02:00
Alexandre Dulaunoy 5bb79549e9 Merge pull request #1549 from ppanero/shibbsso 
warining  due to session start fixed, warning due to org assigment wh…
 2016-09-20 16:20:22 +02:00
ppanero 7493107634 warining due to session start fixed, warning due to org assigment when possible null fixed, readme updated 2016-09-20 16:12:31 +02:00
Iglocska aa03830643 chg: Default roles all have API access 
- changed the default role set to have api access enabled
- existing installations not affected
- if a community wants to restrict API access for certain users they're free to do it
 2016-09-20 14:38:54 +02:00
Iglocska aaad44aa38 fix: Fixes to the API request e-mail 2016-09-20 09:59:03 +02:00
Andras Iklody ed340b3b23 Merge pull request #1547 from cristianbell/fix_request_API_wrong_user_emailed 
fix: fixes a bug introduced by f37963fde4ad91b625d3ee80eb52ebd048f3dc…
 2016-09-20 09:47:19 +02:00
Cristian Bell c2f71c96da fix: fixes a bug introduced by f37963fde4 where on API request the user itself receives an e-mail and not his org_admin or site_admin 2016-09-20 09:35:12 +02:00
Iglocska 490c20718e chg: Added sane defaults to the describeTypes api 2016-09-20 00:22:06 +02:00
Iglocska 3142f05e69 fix: Added a fallback for no active flag being set on sharing group capture 2016-09-19 14:29:06 +02:00
iglocska 29671a6ac1 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-09-18 16:47:06 +02:00
Andreas Ziegler 9604af90e8 fix: issue resulting from references removal, #1501, 25e52a6 (#1544) 2016-09-18 16:43:09 +02:00
iglocska f6187f8fa5 fix: Fallback to insecure random for php 5.x if the random_compat submodule isn't loaded 2016-09-18 16:11:33 +02:00
iglocska c7414d9e56 fix: Fixed the inversed namespacing in the STIX export, fixes #1543 2016-09-18 15:21:34 +02:00
iglocska c6f7103399 Merge branch '1541' into 2.4 2016-09-18 13:12:21 +02:00
iglocska ba9b084f48 Merge branch '2.4' into 1541 2016-09-18 13:12:11 +02:00
iglocska 7d181c8d4c Merge branch '1457' into 2.4 2016-09-18 13:10:18 +02:00
iglocska 075056b4f8 chg: generatePassword now uses random passwords with a minimum length of 12 characters 2016-09-18 13:07:16 +02:00
iglocska 62a2211a23 Merge branch '2.4' into 1457 2016-09-18 13:06:03 +02:00
iglocska 6ee0cda417 Merge branch '1501' into 2.4 2016-09-18 11:07:43 +02:00