Commit Graph

59 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
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
iglocska d27ddee207 First rework of the siteadmin role
- ADMIN org removed.

- Siteadmins are now identified by the perm_site_admin flag

- Siteadmins can now be of any organisation

- editing the regexp / whitelist rules can now be done by a special user with the perm_regexp_access in his/her role

- Executing a mass replace of attribute values based on the regexp rules cannot be initiated by a regexp/whitelist user, only by a site admin

- If the login page is reached without any users / roles defined they are automatically created (perviously it was only the user that was created)

- Org admins are restricted from assigning perm_site_admin, perm_sync and perm_regexp_access roles to users. This can only be done by a site admin.
2013-10-03 11:45:27 +02:00
iglocska 6895548877 Merge branch 'develop' into feature/discussion
- Pivots, attributes, discussions hideable

Conflicts:
	app/Controller/EventsController.php
	app/webroot/css/main.css
2013-09-10 16:51:56 +02:00
iglocska 9f3dadfadf Menu change
- added link to view the proposals
2013-09-03 15:50:30 +02:00
iglocska 1ad3a8ffd6 Discussion boards
- First fully working version
- Create threads or create a thread attached to an event
- Add posts to threads / edit them / delete them
2013-08-14 17:46:57 +02:00
iglocska 7e6f73a776 Removal of the blacklist
- Since regexp can be used to blacklist things, there's no need to have
two separate features that accomplish the same thing

- Add a regexp named /1.1.1.1/ with nothing as replacement and it will
behave the same as adding a blacklist for 1.1.1.1 in the old system.
2013-07-05 14:34:32 +02:00
iglocska 1b79963ce8 UI changes applied to the actions menu
- The side menu is now fixed / relatively positioned based on the debug
mode, like the header and the footer.
2013-07-04 13:35:04 +02:00
iglocska 0b50604274 Some changes to the UI
- The previous UI changes fixed the top and the bottom bar to the
viewport

- It was great for the UI with the debug disabled, but it obstructed the
debug info with it on

- now, turning debug off fixes the top bar and the bottom bar, turning
it on returns it to the top and bottom of the page, as it was in earlier
versions
2013-07-04 11:25:48 +02:00
iglocska 8495cf5d77 HTML error fixed
incorrect span in ul
2013-07-03 10:39:00 +02:00
iglocska c58eb89013 Changes to the UI
- login screen looks a bit fancier and is more customisable
- admins can add a Logo next to the login fields, there's a MISP logo
ontop with a line of text above and below it, editable via bootstrap.php
- Footer re-added, has the PGP key download and the center footer text
from MISP 1.1
- A logo on the right side of the footer, optionally added by
bootstrap.php

- Header, Footer, menu are now fixed and not affected by scrolling the
screen
2013-07-02 15:41:11 +02:00
iglocska 753c034d4e Some UI changes
- removed the e-mail for non site admins from the event index (they can
still see it in the event view if the event was created by the same org)

- added a text MISP logo

- smaller icons for the event index
2013-06-25 14:39:50 +02:00
Christophe Vandeplas 70f062962c page for admin with some links 2013-06-24 15:09:11 +02:00
Christophe Vandeplas 0baf311f3c grouped documentation 2013-06-24 14:45:25 +02:00
iglocska 55f47d3166 ShadowAttribute notifications, and some minor fixes
- New field for events, locking an event from sending out a contact
e-mail when a proposal is made to it
- Default setting for the new field is 0, if a shadow attribute is
added an e-mail is sent to all subscribing members of the orgc and the
new field is set to 1
- Accepting a change resets the field to 0
2013-06-20 16:21:55 +02:00
Christophe Vandeplas 342e5686a7 fix UI issue of top bar 2013-06-19 14:44:58 +02:00