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 |