Commit Graph

2365 Commits

Author SHA1 Message Date
Romain Neutron
03988283b3 Fix #299 2012-02-02 19:58:46 +01:00
Romain Neutron
254801fda0 Fix #294 2012-02-02 19:45:28 +01:00
Romain Neutron
117329b732 Fix list editor template 2012-02-02 19:12:30 +01:00
Romain Neutron
985c30c676 Fix template 2012-02-02 16:35:33 +01:00
Romain Neutron
a9c7ed23cb Coding standards 2012-02-02 15:43:12 +01:00
Romain Neutron
4bff04671f Push & Feedback templates 2012-02-02 15:22:36 +01:00
Romain Neutron
5e61a35eb0 Push & Feedback templates 2012-02-02 15:22:13 +01:00
Romain Neutron
b025bf0eda List Item mustache badge 2012-02-02 11:27:44 +01:00
Romain Neutron
9a9e20ae29 List Manager 2012-02-02 11:26:22 +01:00
Romain Neutron
dd1714fbfa List Manager 2012-02-02 11:26:06 +01:00
Romain Neutron
0f28f12fe7 Merge 2012-01-31 23:04:28 +01:00
Romain Neutron
289537c0ea Use of JS language 2012-01-31 22:04:34 +01:00
Romain Neutron
99a344774f Coding standards 2012-01-31 18:35:27 +01:00
Nicolas Le Goff
ba84c9ea77 fix twig strict variable issue 2012-01-31 12:35:12 +01:00
Romain Neutron
36d328df5c Push / LIst 2012-01-31 12:03:04 +01:00
Romain Neutron
bda6154602 User Add simple form 2012-01-31 12:02:38 +01:00
Romain Neutron
bde51e0b46 Mustache Push templates 2012-01-31 12:02:19 +01:00
Romain Neutron
2dd6fc9354 Upgrade to jQuery UI 1.8.17 2012-01-31 11:37:08 +01:00
Romain Neutron
95ea26263b Upgraded to jquery 1.7.1 2012-01-27 19:25:52 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
e1c95b49a5 Merge with master 2012-01-25 17:25:25 +01:00
Romain Neutron
1ce52264fb Fix readonly fields 2012-01-25 15:27:08 +01:00
Romain Neutron
9f5eae01dc Modify Selectable use 2012-01-25 11:25:52 +01:00
Romain Neutron
a74f5a8e45 Push template 2012-01-25 11:25:33 +01:00
Romain Neutron
49d96618f1 Push-Badge Mustache template 2012-01-25 11:24:48 +01:00
Romain Neutron
7b1e98ce6c Use of new controllers 2012-01-23 18:17:49 +01:00
Romain Neutron
c00561827d Use of new controllers 2012-01-23 18:17:30 +01:00
Romain Neutron
333f0aaa6a Editing template 2012-01-20 18:49:53 +01:00
Romain Neutron
8c39807d3d Adjust javascript 2012-01-20 15:23:07 +01:00
Romain Neutron
8efb4781a1 Add vocabulary settings in description structure 2012-01-20 15:21:34 +01:00
Romain Neutron
09d092ce83 Fix User Edit 2012-01-19 10:36:28 +01:00
Romain Neutron
e7fddf7177 Refactor caption_field 2012-01-18 18:43:01 +01:00
Romain Neutron
4e64f9a1a2 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-18 14:24:57 +01:00
Romain Neutron
37742b67c6 Rename twig templates 2012-01-18 14:18:55 +01:00
Nicolas Le Goff
bbbe292e04 Merge with 3.6 2012-01-17 18:00:34 +01:00
Nicolas Le Goff
555b5be34b handle case where a DC field is null 2012-01-17 16:52:42 +01:00
Romain Neutron
af860e2fa6 Merge with master 2012-01-16 20:19:20 +01:00
Romain Neutron
c813082407 Fix #227 : Import/Export users 2012-01-16 19:30:12 +01:00
Romain Neutron
81b8797b66 Add import to users lists 2012-01-13 13:17:48 +01:00
Romain Neutron
6593e81b5f Add Push Template 2012-01-12 15:34:12 +01:00
Romain Neutron
3d32dcd2ce Merge 2012-01-11 21:06:33 +01:00
Romain Neutron
3b79ba0808 Fix strict variables 2012-01-11 21:00:06 +01:00
Romain Neutron
d952fa6da9 Fix strict variables 2012-01-11 20:59:52 +01:00
Romain Neutron
810e42a15d Browser templates 2012-01-11 20:59:18 +01:00
Romain Neutron
94abb51fe8 User Tooltip template 2012-01-11 20:58:44 +01:00
Nicolas Le Goff
b774bfce9d Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-11 16:59:15 +01:00
Nicolas Le Goff
3125bdc7af Merge 2012-01-11 15:04:52 +01:00
Romain Neutron
867cdce1bd Fix templates with strict wariables 2012-01-11 12:55:28 +01:00
Nicolas Le Goff
b06a1eda8d add raw filter for error & warning 2012-01-11 12:08:56 +01:00
Romain Neutron
8a9b93c1ff Merge with master 2012-01-11 11:29:01 +01:00