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
|
78f629e6dd
|
Redo Event.user_id
|
2012-07-19 14:52:27 +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
|
957e4f232b
|
minor memory usage improvements by referencing in foreach ($array as
&$value) loop
|
2012-06-11 11:40:31 +02:00 |
Christophe Vandeplas
|
5eb6a89384
|
removed reference to useless user_id.
fixed bug where Contact reporter doesn't work when user does not exist
(contact reporter now sends mails to all the org)
|
2012-06-08 16:57:10 +02:00 |
Christophe Vandeplas
|
9cd1b0469d
|
minor change
|
2012-06-06 11:03:08 +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
|
ad69aeb38f
|
only sync event on publish when sync feature is on
|
2012-05-25 09:34:54 +02:00 |
Christophe Vandeplas
|
747c211723
|
auto-upload when publish event
|
2012-05-25 09:31:14 +02:00 |
Christophe Vandeplas
|
efa590de23
|
moved some functions around
|
2012-05-25 08:13:40 +02:00 |
Christophe Vandeplas
|
cd30bb5d30
|
push / pull seems to work with attachment support. Lots of testing
required.
|
2012-05-23 16:32:46 +02:00 |
Christophe Vandeplas
|
aea079b8c4
|
bugfix in Attribute validation
Do not search for related attributes for specific types
|
2012-04-25 10:30:23 +02:00 |
Christophe Vandeplas
|
a2d073b7b9
|
REST POST of event and signatures works (basics, no error-handling)
|
2012-04-10 15:47:42 +02:00 |
Christophe Vandeplas
|
20cddd07db
|
changed alerted -> published
other minor fixes
|
2012-03-27 14:49:31 +02:00 |
Christophe Vandeplas
|
7c4394682d
|
Renamed Signature to Attribute
|
2012-03-26 19:56:44 +02:00 |
Christophe Vandeplas
|
da2687846b
|
Implemented file-upload of attachment or password protected
malware-samples. Base code contributed by Andrzej Dereszowski
|
2012-03-23 20:04:22 +01:00 |
Christophe Vandeplas
|
ce0c0aba0e
|
isAuthorized now handles permissions on admin,delete,edit,... actions
|
2012-03-20 14:57:52 +01:00 |
Christophe Vandeplas
|
495cc1a6c2
|
UUID support for syncing
|
2012-03-20 13:40:58 +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 |