Commit Graph

3304 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
Iglocska 2566d49278 Fix to the Proposal alerts not going out to users after one has failed 2016-01-29 14:28:42 +01:00
Alexandre Dulaunoy 5524def34f Merge pull request #893 from deralexxx/patch-2
mention install howto in Documentation part
2016-01-29 13:57:34 +01:00
Alexander J b9db1494cb mention install howto in Documentation part
Spent some minutes to find the documentation how tot install MISP (and it is not mentioned in the PDF btw)
2016-01-29 13:55:26 +01:00
Iglocska d3d2c8a46f Flash message if the current user can accept/discard proposals on the currently viewed event 2016-01-28 15:40:32 +01:00
Iglocska 9580583b8a Fix to the download as... -> CSV export
- incorrect parameter passed blocked CSVs from being exported when non IDS worthy attributes were meant to be included
2016-01-28 13:58:35 +01:00
Iglocska 7b3d2af8c4 Reverted the header change, added note in app/Config/email on how to enable it
- otherwise it might break custom e-mail configurations
2016-01-28 13:13:15 +01:00
Iglocska e12e0a018d Fix for the previous header issue 2016-01-28 13:05:22 +01:00
Iglocska 8799d6a745 Attempt to fix the returnPath issue
- it looks like PHP is overriding the setting
2016-01-28 11:36:15 +01:00
Iglocska e827d1044d Set the returnPath header in e-mails correctly 2016-01-28 11:16:49 +01:00
Iglocska 9df5c7703b Version bump 2016-01-28 10:22:37 +01:00
Iglocska 1362cf40b7 Added org merge tool
- allows a site admin to merge all objects belonging to an organisation into another
  - this can be useful if duplicate organisations exist for example
  - the tool overrides the built in mechanism and should only be used if absolutely required
  - at the end of the process the original organisation is removed

- the tool generates 2 files that are dropped in the log directory of MISP
  - 1 contains a JSON with all the changed fields and the IDs
  - 1 contains an SQL script that allows an admin to revert the changes
2016-01-27 23:59:34 +01:00
Iglocska 430f8ea479 URL fallback when adding users fails for the sync user dropdown 2016-01-26 10:03:46 +01:00
Iglocska 4cb99afa29 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-26 09:55:55 +01:00
Iglocska 543782b6a5 Fixed a bug that caused the "last" parameter in automation to fail 2016-01-26 09:55:27 +01:00
Alexandre Dulaunoy dc67a04305 Fixed typos for organization 2016-01-25 23:41:43 +01:00
Iglocska 3280338205 Added the option to override attribute creation in the freetext import tool for site admins
- site admins can now choose to create proposals instead of attributes via the freetext import tool via a checkbox
2016-01-25 02:01:59 +01:00
Iglocska dedc739da5 Added a back button on the tag selection, fixes #845
- User can now go back to the taxonomy selection when already in the tag select list
2016-01-25 01:09:33 +01:00
Iglocska 921b42badf Use freetext import tool for proposals, fixes #871
- Added the ability to use the freetext import tool for proposals
2016-01-24 21:50:09 +01:00
Iglocska 2b9887cd42 Show event owner in the alert e-mail, fixes #361 2016-01-24 21:17:08 +01:00
Iglocska c2c41b04d3 Fixed an issue with the freetext import
- url detection would detect any word with a trailing "." as a valid url
  - google. was detected as a url
- this also caused training "."s to be included in valid urls
  - http://www.google.com.
2016-01-23 20:19:44 +01:00
Iglocska c4cf4eca9c Copy pasta fail on the populate from template action
- the lookup for valid event access was comparing the user's org name to the event's org id which always failed
2016-01-22 09:28:33 +01:00
Iglocska 7e12f3b693 Cleanup of loading attachments into the data fields of event data views
- was done inconsistently between attributes and proposals
- adding it via the fetchEvent method instead of the controller action
2016-01-22 09:24:13 +01:00
Iglocska 02a78bcc04 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-22 09:04:32 +01:00
Iglocska 8964546882 Fixed an invalid org lookup on the proposal download blocking users from downloading proposal attachments, fixes #874 2016-01-22 09:03:37 +01:00
Iglocska a4987eb9bd Fix to a translation of the orgs to IDs in the event index filters, fixes #868
- it will now use the org name instead of the org ID
- also, orgs are now sorted alphabetically instead of by ID
2016-01-21 15:49:02 +01:00
Iglocska 0aa9e00875 Discussion notification e-mails linked to an invalid url 2016-01-21 15:25:33 +01:00
Iglocska 8247fdcf6e Fix to a notice in the log search, fixes #872 2016-01-21 15:17:47 +01:00
Iglocska 79e3a0f58d Merge branch 'feature/proposalFix' into 2.4 2016-01-21 14:57:45 +01:00
Iglocska be62a6b053 Entering a valid controller/action and an invalid one produced a different result pre-auth
- not authenticated users now automatically get redirected to the login page, no matter what action they requested
- This as a nice side effect also removed the bug that was caused by a site admin looking at an admin function before logging out / timing out and being incorrectly redirected to /admin/users/login
2016-01-21 14:52:06 +01:00
Andras Iklody 0a97a1dfd6 Merge pull request #866 from MISP/cybox-version-check
Updated version check for cybox to be consistent with documentation
2016-01-20 13:45:15 +01:00
David André e32b07927f Updated version check for cybox to be consistent with documentation
Related to installation documentation update recommending to use 2.1.0.12 as cybox version (a23027e)
2016-01-20 13:41:50 +01:00
David André 7a28b5be72 Updated version check for cybox to be consistent with documentation
Related to installation documentation update recommending to use 2.1.0.12 as cybox version (a23027eee4)
2016-01-20 13:38:18 +01:00
Iglocska 63828920f1 Same SQL statement twice in a row for the cleanup script 2016-01-20 11:51:24 +01:00
Iglocska b3d5422043 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-20 11:47:59 +01:00
Iglocska 999a449cc3 Update to the upgrade procedure
- clearer instructions
- removal script for obsolete columns

- the removed columns can cause exceptions if not removed as described in #814
2016-01-20 11:45:23 +01:00
Andras Iklody 0af55f6476 Merge pull request #865 from MISP/elhoim-patch-1
Add php5-mysql in packages to install
2016-01-20 10:35:24 +01:00
David André b5d6ee0fca Add php5-mysql in packages to install 2016-01-20 10:11:57 +01:00
Iglocska 60ade6a718 Fix to an invalid org lookup
- prevents normal users from seeing the proposal index
- still a left-over from 2.3
2016-01-20 09:42:50 +01:00
Iglocska 9d1ef0e22a Version bump 2016-01-20 09:35:39 +01:00
Iglocska 7d1cb4a7fa Fixed an issue with the visibility of proposals to attributes
- proposals to attributes didn't adhere to the visibility of the attribute
- users that were allowed to see an event but not a specific attribute could see proposals to the attribute
2016-01-20 09:33:55 +01:00
Iglocska 394b5b8203 Change to the previous commit 2016-01-19 18:35:31 +01:00
Iglocska 9935d93913 Fix to the pagination of the orgs 2016-01-19 18:34:11 +01:00
Iglocska b92c1c8db4 Added full text search to organisation index, fixes #803
- also some fixes and enhancements in general for this
2016-01-19 16:25:54 +01:00
Iglocska 038d12a4c0 Fix to an issue with the XML cleanup method
- lead to the XML REST add failing
2016-01-19 15:42:57 +01:00
Iglocska f0bf6b9339 Attributes not included in the .json / .xml views of an event, leading to attachments not being synchronised, fixes #862
- it looks like I've left off the attachment encoding for the REST event view
- Should be fixed now
2016-01-19 13:47:52 +01:00
Iglocska 24261dd6f3 Some changes to the default config file 2016-01-18 15:53:19 +01:00
Iglocska 5a53e1d69d The new footer had two left feet 2016-01-18 15:37:59 +01:00
Iglocska 5ddaee7678 Fix to an invalid permission lookup denying users from mass deleting attributes due to a copy pasta fail 2016-01-18 15:37:07 +01:00
Iglocska 427da7d579 Removed lowercasing of parsed strings in the freetext import
- case sensitive values also got lower-cased
2016-01-18 15:24:48 +01:00
Iglocska d4d0e6ee29 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-18 15:18:01 +01:00