Commit Graph

115 Commits (5abd8dfeadacc8817bda44aac18408d86981f891)

Author SHA1 Message Date
Christophe Vandeplas d099ca8e1c hilight row 2013-05-30 16:40:47 +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
Christophe Vandeplas 3be869a9d5 fix sanitization in Events #96 2013-04-24 15:49:35 +02:00
Andras Iklody 9a6733acfd Removal of deprecated code
- The flag private is deprecated, removed together with the code that was
  affected by it
2013-04-17 11:13:09 +02:00
Christophe Vandeplas 8d5782125d removed unused CyDefSIG.showowner field. Closes issue #93 2013-04-16 15:29:34 +02:00
iglocska 99e0a91aa8 Small bug with sorting events by validation
- didn't work properly, fixed.
2013-03-26 14:32:32 +01:00
iglocska d5800206e6 Bug fixes
- issues of admin orgs not being able to edit/delete org events

- owner org removed for org admins

- email only visible from own org to org admins
2013-03-13 15:11:49 +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 0f947085cb Reworked the sync / release control
- Fixed issues with the sync
	- Secondary publishes on remote servers failed
	- Introduced new fields in events to stop backward traverse of
	  edit information that lead to low performance and eroneous
	  distribution information updates when more than 2 servers were
	  linked
	- Deletion of an attribute now deletes on remote servers

- Changes to the event ownership
	- Original creator org now noted in the event itself
	- Only original creator org can change distribution
	- Events will show up with the original creator org for users
	  (admins can see both that and the owner of the event on the
	  local instance)
	- Server.organization now used in junction with the connecting
	  user's org and the instance's org (from the bootstrap) to
	  determine distribution flow control and access rights

- Lots of minor changes
2013-02-19 15:37:35 +01:00
Andras Iklody 29295e1380 changes to the admin org access and sanitization
1. Some errors fixed in the way redirects worked for org admins

2. fixed some double sanitization resulting in incorrect characters
displayed in certain fields
2013-01-30 11:49:55 +01:00
Noud de Brouwer 120f907427 git
redo 'git-trigger' change.
2013-01-04 13:13:06 +00:00
Noud de Brouwer 4f9a2a5dd9 git
pardon i seem to have had a:
Error: messages not turned on: /dev/ttyp3: Operation not permitted
2013-01-02 15:32:47 +00:00
Noud de Brouwer e14d8d758d unused & coding standard
Removed some total unused code and corrected some toward the CakePHP coding standard.
2013-01-02 14:49:49 +00:00
Andras Iklody 0f751eb742 Validation field
A field in the event index showing it clearly whether the event has been
published or not - shows a small image (placeholder atm)
2012-12-20 16:56:56 +01:00
Noud de Brouwer a17eaa69ad log & code duplication
$this->Html->image($nonExistingImage)
showed up in tmp/logs/error.log and
the origin this is in 2 Views, so a View Element was created.
2012-12-20 10:33:54 +00:00
Noud de Brouwer 132a10182c log
do not logs/error.log if an img does not exist.
2012-12-19 16:18:08 +00:00
Noud de Brouwer f6c140e1dc coding standards
Coding Standards.
2012-12-19 13:34:40 +00:00
Andras Iklody 29cc79255f Added validation field to the event index
A small image at the front of each line showing whether the event has been
validated (published) or not. The images are placeholders for now.
2012-12-19 13:13:39 +01:00
Noud de Brouwer ea9aa8eb3a coding standards
Coding Standards.
2012-12-18 19:25:12 +00: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 c2fa68a198 attributes
display "#Attr.".
2012-12-07 14:03:28 +01:00
noud 45cbe60aa7 distribution
show "All" if distribution is All communities in Events/index.ctp and
Events/view.ctp.
2012-12-07 14:01:41 +01:00
noud 1cddb6abe0 distribution
conform latest, having:
- Your organization only
- This server-only
- This Community-only
- Connected communities
- All communities

Push is tested, pull not yet.
2012-11-16 15:25:57 +01:00
noud b84bc50c56 index
some line disapeared.
Andras Iklody suggested a html non breaking space, that worked.
2012-11-14 16:43:24 +01:00
noud 6b06ba7ff6 count & GFI Sandbox
count # attributes in events index.
plus various fixes for distribution in correlation of a GFI Sandbox
upload.
2012-11-14 16:14:04 +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 12ebfafe16 RBAC
role only add could still publish her own events,
this should be not possible anymore.
2012-11-07 16:02:36 +01:00
noud f66b199f26 distribution
removed No push as a distribution.
2012-11-05 13:05:31 +01:00
noud 2b478605a5 Flags
correct from 50*50 to 48*48, so it's an icon size.
2012-10-31 15:54:15 +01:00
noud 099dd8398f distribution
border="1"-testleftover removed.
2012-10-30 13:19:34 +01:00
noud ed56d7c29c distribution
if distribution is All, so not displayed in an index nor in attributes
per event, there is missing a line-part in IE.
Did add 1 space for All, this will maybe display the line-part again.
2012-10-30 13:16:46 +01:00
noud f296a9381e RBAC
real inactive buttons.
2012-10-25 15:00:43 +02:00
noud e01dd6de77 distribution
do not display distribution 'All' in Events index or Event view.
2012-10-24 08:57:41 +02:00
noud 4b096fa584 distribution
changes and cleanup.
2012-10-23 11:28:39 +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 83c56ebbc0 Pagination
Same pagination in Events as in Attributes.
2012-09-21 08:51:00 +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
Christophe Vandeplas be10754474 improve logo and email display features 2012-08-31 10:23:40 +02:00
noud 5c39a46fc8 Sync.
Better square and croped images.
2012-08-29 13:11:00 +02:00
noud 4ae71fc963 Sync.
Sync worked, but we did not know what to do with user_id and org.
Now, on sync, anonymize the user_id, get the Server.organization and put
that into Event.org.
And, display owning flag if Event.user_id or get the Server.logo
belonging to Event.org (=Server.organization) when Event.user_id is
empty (=0).

To this there is organization name and logo in bootstrap and
other organizations names and logos in Servers.
2012-08-28 15:36:14 +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
git 8ba98a1e57 Rollback of pagination on event view
Comeback to previous event layout. This does not change the preformance issue so it is not worth to put in stable.
We will move it to the devel branch
2012-07-24 15:44:04 +02:00
noud de89d28caa Fix, paging on event with lots of attributes. 2012-07-20 13:27:55 +02:00
noud 25d5ff4290 Show events with user.email if admin. 2012-07-19 14:53:12 +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 7ee4d29fac Fixed merge conflicts with HEAD at belmod
Merge branch 'develop' of code.lab.modiss.be:cydefsig into develop

Conflicts:
	app/Controller/EventsController.php
	app/Model/Attribute.php
2012-05-29 17:19: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
Christophe Vandeplas 6da1906bf4 fixes typo in alert message 2012-05-16 10:27:09 +02:00
Christophe Vandeplas 2142585710 Implemented basics for private, nonsyncable, Events or Attributes. 2012-04-01 18:41:47 +02:00
Christophe Vandeplas 20cddd07db changed alerted -> published
other minor fixes
2012-03-27 14:49:31 +02:00
Christophe Vandeplas 803bdbdf87 micro HTML bugfixes in views 2012-03-25 16:25:16 +02:00
Christophe Vandeplas 4bbbfc36c3 Not finished editing -> not published 2012-03-21 11:01:37 +01:00
Christophe Vandeplas c5954b081b Layout improvements 2012-03-20 15:11:02 +01:00
Christophe Vandeplas 495cc1a6c2 UUID support for syncing 2012-03-20 13:40:58 +01:00
Christophe Vandeplas 2c7f01f61e Rename Finish Edit to Publish Event 2012-03-20 08:26:57 +01:00
Christophe Vandeplas 07f6b5e090 cleanup old __('Actions') and non echo __() 2012-03-16 14:13:31 +01:00
Christophe Vandeplas 865a24d0bd Migration to CakePHP 2.1.
Most of the functionality migrated, Q&A review required.
2012-03-15 15:06:45 +01:00