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 |