Commit Graph

49 Commits (8df300221e2c4bd688893aa0a0495cea7f160f48)

Author SHA1 Message Date
iglocska 708156ee49 Some UI changes and partial update to the manual 2013-06-13 16:10:28 +02:00
Christophe Vandeplas 68c2fd09fe Merge branch 'develop' of https://github.com/MISP/MISP into feature/sync/timestamp
Conflicts:
	app/View/Attributes/index.ctp
	app/View/Events/add.ctp
	app/View/Events/edit.ctp
2013-06-10 23:00:37 +02:00
Iglocska b74179bc84 Further work on the distribution 2013-06-10 21:38:04 +02:00
Christophe Vandeplas d81ffe56b7 Performance improvement with static urls 2013-06-10 11:31:46 +02:00
Christophe Vandeplas 0d66ef931a UI tooltip love 2013-06-06 18:06:22 +02:00
Christophe Vandeplas bdc973f9ed alignment of action buttons 2013-06-03 14:44:31 +02:00
iglocska 7691476fae More UI changes 2013-06-03 10:48:38 +02:00
Christophe Vandeplas bd50135fe6 UI events partial improvements 2013-06-01 08:46:21 +02:00
Christophe Vandeplas d3db196699 UI Logs, documentation, memberslist and fixed bug in highlight 2013-05-31 17:38:46 +02:00
Christophe Vandeplas 0deff7d5a5 attribute search and list 2013-05-31 11:35:27 +02:00
Christophe Vandeplas d099ca8e1c hilight row 2013-05-30 16:40:47 +02:00
Christophe Vandeplas d0afda8df5 minor improvements 2013-05-30 11:40:07 +02:00
Christophe Vandeplas 0fa30912a3 mirated first parts of nice GUI proposed by Alexandru of CERT-EU 2013-05-30 11:14:00 +02:00
Andras Iklody b98818ebfb Small errors with the merge corrected
- some errors managed to slip through during the merge, should be fixed
2013-04-25 15:37:49 +02:00
Andras Iklody 4396cec8ea Integrated ownership, ACL and minor fixes
- Orgs can propose new attributes or changes to existing attributes for
  events that they do not own

- publishing users of the owner organisation can see, accept or discard
  them

- Reworked the access control

- minor fixes
2013-04-25 14:04:08 +02:00
Christophe Vandeplas e9bcacfbc3 fix sanitization in Attributes #96 2013-04-24 15:20:20 +02:00
iglocska 8c0a7ad716 Double sanitization fixed 2013-03-19 15:13:07 +01:00
iglocska f008eb9f07 Search for attributes by organisation
- New search functionality on request - restrict attributes by
  organisation

- Also, attributes in the list attributes and search attributes result
  pages, that belong to the user's organisation will have a red event ID
2013-03-19 11:54:14 +01:00
iglocska 320a9f4e05 Slight change to the xml export of search results
- Disabled the feature for "List Attributes".
2013-03-18 13:16:55 +01:00
iglocska 32de082c88 New export feature
- To restrict the authentication key from being used by interactive users,
implemented a new export page that uses the uses cake's user
authentication

- the old export features still exist for users with perm_auth enabled
  accounts - renamed to automation

- Exporting the events that found attributes belong to in a search
  attributes result page

- exporting of individual events to file by clicking a link in event view
2013-03-18 11:48:36 +01:00
Andras Iklody 019e976783 Removed the js title bubble for related events
- Removed javascripts based title bubble showing the event info in related
  events / attributes and in the search attribute view.

- Replaced it with values provided by extra cake queries as the delay for
  fetching the info field through a js rest request was annoyingly slow

- some coding standards
2013-03-08 13:16:02 +01:00
Andras Iklody 64f304da48 Tighter checks so users can't edit events of other orgs 2013-03-05 16:17:34 +01:00
Andras Iklody 4a368918eb Colouring of search terms works in links
- links now have proper colouring to make the found terms more visible
2013-03-04 18:05:17 +01:00
Andras Iklody 01649046c0 Several things (search, migration)
- Changes to the default setting for non private events after migration

- search attribute update to be able to exclude events
2013-02-27 17:15:09 +01:00
Andras Iklody 6333055cfc Added hover over event IDs in search attributes view
Hovering over the event IDs now shows the event info in the list generated
by the search attributes page
2013-01-29 13:33:07 +01:00
Noud de Brouwer 31207a5696 coding standards
Coding Standards typo.
2012-12-18 20:45:57 +00:00
Noud de Brouwer ea9aa8eb3a coding standards
Coding Standards.
2012-12-18 19:25:12 +00:00
Andras Iklody 099e5d92be Fix for the Attributes 2012-12-17 17:21:57 +01:00
Andras Iklody 1ceadab700 Added features from branch analysis_levels
-Analaysis levels setable for events as per milestone item 94
-Password change forced as per milestone item 109
-Added feedback on entered search terms for search attributes
-fixed the authentication issue
-some minor fixes
2012-12-17 15:51:30 +01:00
noud 55f9b594d7 RBAC
just edit your own did still give edit org as well.
can be tested if now correct.
2012-11-09 10:14:40 +01:00
noud a2bc237bcd RBAC
should now respect Manage, so also edit, own and org events.‏
2012-11-08 14:09:52 +01:00
noud f296a9381e RBAC
real inactive buttons.
2012-10-25 15:00:43 +02:00
noud 8f3d624c1a Merge branch 'master' into develop
Conflicts:
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Controller/UsersController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Attributes/edit.ctp
	app/View/Attributes/index.ctp
	app/View/Elements/actions_menu.ctp
	app/View/Events/add.ctp
	app/View/Events/index.ctp
	app/View/Events/view.ctp
	app/View/Events/xml/view.ctp
	app/View/Servers/index.ctp
	app/View/Users/admin_index.ctp
2012-09-24 16:02:01 +02:00
noud 1d04652476 CakePHP Coding Standards
changed to camel caps format where needed.
2012-09-19 11:05:10 +02:00
noud 94a367c2f5 CakePHP Coding Standards
http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html

Eclipse:
Window->Preferences
	General->Editors->Text Editors
		Displayed tab width:	4
		Insert spaces for tabs	NOT
	PHP->Code Style->Formatter
		Tab policy:	Tabs
File->Convert Line Delimeters To->Unix [default]

http://mark-story.com/posts/view/static-analysis-tools-for-php
for instance:
phpcs --standard=CakePHP app/Model/

Not yet done is all camel caps format.
2012-09-18 15:30:32 +02:00
noud 253d8e1b58 Merge branch 'master' into develop
Conflicts:
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/View/Events/view.ctp
2012-09-17 13:02:53 +02:00
noud 4cec4e69f9 correlation.
do not use the AttributesController::event now,
just use the old EventsController::view.
2012-08-24 14:06:08 +02:00
Andrzej Dereszowski 3ff180e898 Merge branch 'develop_0.2.2-0.2.3' into develop
Conflicts:
	app/Config/Schema/schema_0.2.2.php
	app/Config/routes.php
	app/Controller/AppController.php
	app/Controller/UsersController.php
	app/Model/User.php
	app/README.txt
2012-07-24 16:09:48 +02:00
noud de89d28caa Fix, paging on event with lots of attributes. 2012-07-20 13:27:55 +02:00
deresz dbf7fafea8 Correction to "link" attribute type - links were not actually created.
Also changed it to proper "cake" way.
2012-07-04 15:51:19 +02:00
noud 66c5312ea6 DataBase migrate, Audit and Access Control granulation. 2012-06-28 17:24:12 +02:00
root b4558887ce Revert "Audit and ACL first cut."
This reverts commit 5818231f48.
2012-06-26 09:40:52 +02:00
noud 5818231f48 Audit and ACL first cut. 2012-06-25 15:54:52 +02:00
Christophe Vandeplas 66a9950d14 minor improvement in usability on index pages 2012-06-25 08:00:08 +02:00
Christophe Vandeplas e453ee0e97 Sanitize::html() to h() for views is the way to go 2012-06-05 10:00:36 +02:00
Andrzej Dereszowski 51dbbcfa13 Explanation messages implemenented for forms and for list views (using
"title" html element)
2012-05-29 16:50:45 +02:00
Andrzej Dereszowski faffe87ea6 - some bugfixes in validation corrected
- new attribute type - link to external site
2012-04-02 19:24:50 +02:00
Andrzej Dereszowski 216b77f854 - Attributes index view fixed (attachments) 2012-04-02 11:59:51 +02:00
Christophe Vandeplas 7c4394682d Renamed Signature to Attribute 2012-03-26 19:56:44 +02:00