Commit Graph

173 Commits (a61caa3a6a541e6f9761ae99c033c7457050bc0b)

Author SHA1 Message Date
iglocska 480e3b2969
Merge branch 'dev_session' into 2.4 2019-09-29 20:23:00 +02:00
StefanKelm 8e947f182b
Update global_menu.ctp
Align menu with other entries
2019-09-27 15:39:10 +02:00
iglocska 946602a696
new: [User settings] Added user settings system
- set settings / user
- settings can be set by user themselves or their org admin / site admin
- added first setting: publish_alert_filter
- accepts boolean branched filter options
  - supports deep logical trees
  - OR/NOT/AND
  - currently supports filtering on tags and the creator organisation
2019-09-25 11:50:54 +02:00
mokaddem a5d06d1333
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-08-29 10:52:18 +02:00
iglocska b9398edc56
fix: [menu] Added community index to the top menu 2019-08-29 10:03:17 +02:00
mokaddem fd30141cdf
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-08-27 08:20:42 +02:00
iglocska 8769bed9ec
new: [delegations] Added delegation index, fixes #5023
/event_delegations/index

accepts context as a parameter with the following possible values:
- pending: all delegations awaiting my organisation's review (default)
- issued: all delegations issued by my organisation

parameters can be passed via key:value parameters or via json objects
2019-08-23 11:38:47 +02:00
mokaddem a683b420bd
fix: [decaying:acl] Various ACL fixes 2019-08-19 15:19:01 +02:00
mokaddem 81af1faf57
chg: [globalmenu] Added link to `/decayingModel/index` 2019-08-16 09:24:25 +02:00
mokaddem 6ba45b27f8
Merge remote-tracking branch 'origin/2.4' into decaying 2019-08-13 16:32:58 +02:00
iglocska 4781d68a44
chg: [UI] Added the new user name helper 2019-08-02 10:45:55 +02:00
iglocska 954b7e6727
fix: [proposals] shadow_attributes/index default behavior modified to show all proposals by default, fixes #4936 2019-07-29 11:38:20 +02:00
mokaddem 76cddeb264
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-07-03 13:45:49 +02:00
iglocska aae9307106
new: [Sync] Add a tool to create MISP sync configuration JSONs and to ingest them, fixes #4696
- sync user can log into remote instance, extract config JSON
- paste it into own instance as site admin to add MISP sync connection
2019-05-30 14:42:29 +02:00
mokaddem e4bc67463b Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-04-10 08:39:13 +02:00
iglocska ab858d5f17 new: [feeds] Feed/Server cache search added
- /feeds/searchCaches added
2019-04-01 16:09:24 +02:00
4ekin 0b33adedc1 fix: fixed i18n string representation in Views
Fix for a plenty of Views with incorrect localizations (only English
text shown)
2019-03-21 18:10:26 +03:00
mokaddem 662d58e1ae chg: [decaying] Model and UI improvement - WiP 2019-03-08 16:19:07 +01:00
mokaddem 785d83607a chg: [decayingTool] Added model and controller 2019-03-08 09:22:37 +01:00
mokaddem 8e78d77cc5 chg: [decaying] UI skeleton - WiP 2019-03-05 14:54:19 +01:00
Richie B2B 6ae5ee8fe5
Fix broken "List Tags" link 2019-02-18 17:38:38 +01:00
iglocska a34d4dcfb2 fix: [UI] Logout fixed 2019-02-16 18:20:19 +01:00
iglocska b0361efc2f fix: [UI] UI monkey cannot z-index 2019-02-15 15:53:01 +01:00
iglocska 55ba0d6773 new: [UI] Moved the global menu to the new system 2019-02-15 12:57:45 +01:00
iglocska 498a7ae77c new: [feeds] Opened up feed inspection to host org users and added servers to overlap matrix 2019-01-20 10:19:05 +01:00
iglocska 3ba8c360bf new: [WIP] tag collections WIP 2018-12-20 21:48:04 +01:00
Steve Clement 1ef2a1f91e Merge branch '2.4' into guides 2018-09-06 13:58:43 +02:00
Steve Clement 7a77c34e4c chg: [doc] Point to official misp-book, MISP "User Guide" in main codebase is obsolete. 2018-09-06 13:47:20 +02:00
Steve Clement 407ab26027 upd: [i18n] Fixed easy missing __() 2018-08-21 14:27:54 +03:00
iglocska c8fcb16881 new: [feature] Built in REST client added to test / interact with the API directly from MISP
- no more shitty chrome extensions that crash during trainings, rejoice!
2018-08-08 11:29:38 +02:00
iglocska 58997b9ac1 chg: [psr-2] Changed view files to space indentation instead of tabs
- *sniff sniff*
2018-07-20 09:29:50 +02:00
Steve Clement 768c9c19c1 chg: [i18n] Added __('') where needed/missing 2018-07-12 10:49:46 +02:00
iglocska 05cf0563e1 new: First implementation of the Noticelist system ready 2018-05-07 10:43:21 +02:00
Émilio Gonzalez 44d35fb11c new: Add keyboard shortcuts application-wide, managed using JSON files. 2018-02-05 16:27:08 -05:00
iglocska 94106d809d fix: Changed name of server settings -> server settings & maintenance, fixes #2817 2018-01-16 12:35:00 +01:00
iglocska 297802c2cb fix: Changed checks from isSiteAdmin to isAclSharingGroup for the org index anonymisation 2018-01-13 17:00:44 +01:00
iglocska 7772b9c43e new: Disable the viewing of a full organisation list by normal users
- Only site admins and sharing group editors can see organisation lists
  - this includes the org index and various statistics
- Keep in mind: Sharing group editors CAN see the full organisation list - otherwise they wouldn't be able to create sharing groups.
- Also, users CAN enumerate organisations that have created ANY data on the instance by looking at the given data
  - this includes events, proposals, discussion entries, etc
2018-01-13 16:55:01 +01:00
iglocska 1b30913d66 fix: Various UI fixes
- no more walk of shame after demoing MISP on a potato quality projector (beamer for our Belgian/Dutch/German friends)
2017-10-09 15:38:31 +02:00
iglocska ee1c1c5de9 new: Further progress on the objects 2017-07-02 00:05:15 +02:00
iglocska 718a3381fb fix: First round of Accessibility issues resolved with span links 2017-03-11 17:31:38 +01:00
iglocska 46695b8ca2 fix: Several blacklist related fixes
- turned the functionality to a default on feature
- added indexes
- fixed some default values
2017-03-07 17:39:44 +01:00
Iglocska e46cbd0991 new: First iteration of the galaxies (WIP) 2016-12-05 00:47:34 +01:00
Iglocska c76d358535 new: Added new statistics page, fixes #1648, fixes #1557
- brought back the quick organisation overview as it's a much missed feature
- added treemap for tags
- brought attribute histogram into statistics page

- more coming in the future
2016-11-04 13:14:03 +01:00
iglocska 1d5b7185ff Merge branch '2.4' into memberslist 2016-08-13 23:17:51 +02:00
iglocska f3c7502071 fix: Removed the old administrative tools panel 2016-08-08 17:48:24 +02:00
Cristian Bell 72b9bdbb84 chg: redundant members list and organisations page 2016-08-04 13:45:10 +02:00
Cristian Bell f29b1c1e2e chg: redundant members list and organisations page #1013 2016-07-28 17:36:24 +02:00
Iglocska c36f62d47e fix: Small fix to the top menu when debug mode is enabled 2016-06-08 00:03:05 +02:00
Robert Haist 66aee6b8d4 Small, non breaking changes to the MISP look and feel:
- Removed old school glass stuff from navbars (bye bye)
- Removed blue flame effect from MISP branding (srsly WHY?)
- Minor ajustments to flush the changes globally
2016-06-07 22:05:09 +02:00
Andreas Ziegler 1d06f25b38 chg: add newline character before EOF to non-minified (text-)files 2016-06-06 10:09:55 +02:00
Andreas Ziegler 985451642e add space after keywords if/for/foreach/while/switch/catch 2016-06-04 15:45:39 +02:00
Andreas Ziegler 0fe692c56a remove whitespace at end of line 2016-06-04 01:10:45 +02:00
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska d02adf2085 new: Added the news functionality back
- admins can add/edit/delete news items
- users get redirected if there is a newsitem that they haven't seen yet
2016-05-20 01:17:26 +02:00
Iglocska 9d6e23c8c1 Import, enabling, viewing, indexing of warninglists finished 2016-04-22 01:31:13 +02:00
Iglocska 24c7fa61fe Merge branch 'permissionfix' into 2.4 2016-04-18 17:41:59 +02:00
Iglocska d680fd92db Don't display menu items that the user has not right to access #1097
- Removed feeds button for org admins
2016-04-18 15:32:56 +02:00
Iglocska fea6c35140 Split the tagging permission into two
- New permission flag: perm_tag_editor
  - taggers can tag events with existing tags
  - tag editors can create / edit / delete tags

- Fixed several misleading UI elements for tagging
  - tagging users that don't own an event and aren't creators thereof cannot tag them
  - this was enforced before but the UI elements were present and threw errors

- Migration is automatic
  - all existing tagger roles will automatically become tag editors
  - restricting current roles takes manual admin action, but the functionality should remain unchanged for those that just update
2016-03-30 18:32:17 +02:00
Iglocska 6a846d4c11 Added org blacklisting to the global menu 2016-03-28 09:01:46 +02:00
Iglocska b3aed862ea Customise the home button 2016-03-18 14:06:34 +01:00
Iglocska cbb2a92f4b Added custom password reset / logout url 2016-03-18 08:00:32 +01:00
Iglocska 8eee32d869 Optionally remove the log out button from externally authenticated users. 2016-03-16 22:57:48 +01:00
Iglocska 255c65942e Further progress on the feeds 2016-02-29 22:32:04 +01:00
Iglocska a1ffdc7790 First finished version 2016-02-12 05:47:06 +01:00
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska 5dbbe84069 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ShadowAttributesController.php
	app/Model/Event.php
	app/View/Elements/side_menu.ctp
2015-11-30 09:37:22 +01:00
iglocska 9eb5680ee8 Reimplementation of the Add XML feature
- called Add MISP export now
- can be an XML / JSON file
- result browser with explanations of failures

- REST XML/JSON add/edit of events returns errors instead of the partially succeeding event
2015-11-30 02:28:07 +01:00
iglocska 3784209cf5 First bash at Taxonomies
What works:
- added submodules for taxonomies
- added import tool for taxonomies
- added models and convenience functions for taxonomies

- site admins can update taxonomy libraries
- list taxonomies / view indvidual ones (with all resolved tags)
- create tags manually if a taxonomy is enabled
- view related tags / events quickly from the Taxonomy view

What doesn't work:
- Users still cannot choose a tag from taxonomy lists (this will be the main functionality)
- Feature cannot be disabled
2015-11-24 03:27:14 +01:00
iglocska 332d5fa666 Reverted the sanitisation of the baseurl variable on the view level
- sanitising it in appcontroller instead
2015-11-17 01:17:10 +01:00
iglocska 485c007b39 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/EventTag.php
	app/Model/TemplateElementAttribute.php
	app/Model/TemplateElementFile.php
	app/Model/TemplateElementText.php
	app/Model/ThreatLevel.php
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/eventattributerow.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 01:14:51 +01:00
iglocska b3a2428345 Merge branch 'basedir' into hotfix-2.3.160
Conflicts:
	app/Controller/AppController.php
	app/View/Pages/administration.ctp
2015-11-17 00:33:34 +01:00
pugilist 79eab81a43 updated an anchor that was missed previously 2015-11-09 09:29:07 -05:00
pugilist ec7d85332c modified many instances of html anchors and javascript document.location to use 2015-11-08 15:38:24 -05:00
Iglocska 328c666e3a Merge branch 'master' into feature/sg
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
2015-10-12 09:41:20 +02:00
iglocska 26e640e19c Further progress on several issues 2015-09-16 12:15:43 +02:00
Iglocska 704880ce59 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
2015-08-30 13:29:05 +02:00
iglocska a93807439d Several bigger changes
- new functionality: Event blacklisting by UUID
  - site admins cna enable this feature in the server settings
  - enabling the feature will make the required db changes
  - any deleted event will automatically get blacklisted
  - this prevents deleted events from flowing back from a synced instance
  - site admins can manually add UUIDs to the list and remove entries

- fix to UUID duplication issues for attributes
  - simply run the admin script and it will regenerate the UUID of attributes that are duplicates, if any such exist
  - timestamps/event published status will not be affected

- config.core.php now includes a change that prevents from 404 exceptions being logged
  - the sync uses 404s to signal that an event with a given uuid does not exist when negotiating proposal synchronisation
  - this causes a dangerously high amount of noise in the logs
2015-08-17 16:10:10 +02:00
iglocska 51ea9c090d Further progress 2015-04-18 07:53:18 +02:00
iglocska 29a6f10048 Merge branch 'master' into feature/sg
Conflicts:
	app/webroot/js/ajaxification.js
2015-02-23 11:38:54 +01:00
iglocska bdc6b5fa8f Initial commit 2015-02-23 11:33:38 +01:00
iglocska 8dad666b38 Disabled the animation in the MISP logo
- it was quite heavy on CPU usage and it was too subtle to notice anyway
2015-02-20 11:11:00 +01:00
iglocska 67aa9d9859 Admin contact user menu moved next to new/list user buttons, recipient e-mails are now sorted alphabetically 2014-12-05 15:15:28 +01:00
iglocska 1058e418b9 Added the new server settings to the menues 2014-09-11 10:07:06 +02:00
iglocska 79127902b7 Cleanup, MISP health tool
- cleanup of a lot of deprecated settings
- tool to help assess and alter issues with the instance settings
- new mechanism to store settings
2014-09-10 09:43:22 +02:00
iglocska 51d83f8ceb Fixed the annoying collapsing top bar 2014-08-01 15:41:48 +02:00
iglocska a4a987e027 More work on the templates
- Templates can now be created and populated
- Users can populate an event using a template (still needs work)
- File type elements are not yet implemented
2014-06-19 08:44:35 +02:00
iglocska 291892be05 Merge branch 'develop' into features/ajaxification
Conflicts:
	app/View/Elements/img.ctp
2014-05-05 09:56:42 +02:00
iglocska 303de0e3aa Further work on the ajaxification
- mass deletes / mass edits

- tagging now done via ajax

- also, several small unrelated issues fixed
2014-04-24 15:10:08 +02:00
iglocska 339913b6a6 Small changes to the UI to help with low resolutions
- side menu now becomes fixed if the resolution is too low to fit all menu elements
- fix to the logo resize script causing errors when on the login screen - due to it never being rendered.
2014-03-28 11:47:57 +01:00
iglocska eb69a6e78f User guide and UI changes
- first set of changes to the user guide, still missing updated images

- some UI changes to make the looks a bit more appealing
2014-03-06 09:20:05 +01:00
iglocska 22c8105f58 Mass replace replace of the old CyDefSig name to MISP - fixes #82 2014-02-05 15:01:26 +01:00
iglocska 4215066a90 Fixes to the tagging
- made menu options invisible for non tagging permission users that requires the permission
- colour picker added to edit (was only enabled on add)
2014-01-24 09:24:04 +01:00
iglocska 7bd7405a8f Roles correctly visible to users
- users can now check what each role group grants in terms of permissions
- users cannot see a non-working add user / list users button
2014-01-16 10:55:24 +01:00
iglocska 89c80a8b7c Some security fixes 2014-01-10 13:56:35 +01:00
iglocska 54b1b44080 More work on the background jobs
- added scheduler to the export caching
- site admins can set up the intervals of the automated caches, and the exact times at which they should be executed.
2014-01-03 15:26:35 +01:00
iglocska f0944ab9b0 Proposal changes Fixes #192
- Contextual comments for proposals
- shows proposal count in the top bar
- new view showing all of the events of the user's organisation with an active proposal
2013-12-12 16:25:20 +01:00
iglocska 50f3fa40d0 Merge branch 'develop' into feature/CakeResque
Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
2013-12-04 11:58:01 +01:00
iglocska be723fc821 Merge branch 'feature/discussion' into develop 2013-11-06 10:13:47 +01:00
iglocska bbbc17a95b Merge remote-tracking branch 'origin/feature/XML_and_UI' into feature/discussion
- Also some improvements to the shadow attributes

- some minor UI changes

Conflicts:
	app/Controller/EventsController.php
	app/View/Elements/global_menu.ctp
	app/View/Layouts/default.ctp
2013-10-30 10:06:12 +01:00
Christophe Vandeplas b8fa651aad quickstart in docu 2013-10-29 11:36:00 +01:00