Commit Graph

2513 Commits

Author SHA1 Message Date
Romain Neutron
adf7e62f20 Fix build 2011-12-29 18:30:58 +01:00
Romain Neutron
d327e5f4f9 Fix templates 2011-12-29 18:26:10 +01:00
Romain Neutron
5112c19235 Fix templates 2011-12-29 18:25:43 +01:00
Romain Neutron
647946e802 Merge branch 'RequiredField' into 3.6 2011-12-28 23:12:23 +01:00
Romain Neutron
d0761afae1 Fix #129 : setup a databox field as required 2011-12-28 23:11:49 +01:00
Romain Neutron
c7e0dd378c Merge branch 'FixSeparator' into 3.6 2011-12-28 23:05:46 +01:00
Romain Neutron
88552650a0 JY changes 2011-12-28 22:55:11 +01:00
Romain Neutron
646db61ca7 Refactor asket_adapter 2011-12-28 20:04:39 +01:00
Romain Neutron
607974edcb Merge branch '3.5.5' into 3.6 2011-12-28 15:00:18 +01:00
Romain Neutron
52dba2b3a0 Fix #126 : render of ftp export fails 2011-12-28 14:51:49 +01:00
Romain Neutron
742befa16a Fix #128 ; highlight on multivalued fields fails 2011-12-28 14:47:24 +01:00
Romain Neutron
763cceb4d1 Fix basket_adapter 2011-12-27 20:36:14 +01:00
Romain Neutron
ff7a5d2128 Basket refactor 2011-12-27 19:17:36 +01:00
Romain Neutron
1257da5d70 Workzone stories attach/detach 2011-12-27 19:15:30 +01:00
Romain Neutron
ae4ac2b911 Fix javascript typo 2011-12-27 19:13:29 +01:00
Romain Neutron
e3727938fb Merge branch 'FixSeparator' into 3.6 2011-12-27 14:36:19 +01:00
Romain Neutron
bf3d78b700 Fix #122 : customization du separateur de valeurs multivaluées 2011-12-27 14:32:13 +01:00
Romain Neutron
bb03cb1344 Refactor basket_adapter 2011-12-27 14:07:27 +01:00
Romain Neutron
03a0703441 Fix locale selector 2011-12-26 20:40:02 +01:00
Romain Neutron
e3294e6f47 Merge with master 2011-12-26 18:39:41 +01:00
Romain Neutron
9f8dd943b3 Fix #110 : make user management table sortable 2011-12-26 17:24:50 +01:00
Romain Neutron
96fc59563b Add option to apply template to Twig templates 2011-12-26 16:08:17 +01:00
Romain Neutron
70768e5e38 Fix admin user editing with new image header 2011-12-26 14:12:59 +01:00
Romain Neutron
6a815c91da Refactor basket_adapter 2011-12-26 10:49:02 +01:00
Romain Neutron
d10aa10424 Refactor basket_adapter 2011-12-26 10:48:44 +01:00
Romain Neutron
d42201986a Refactor basket_adapter 2011-12-26 10:47:56 +01:00
Romain Neutron
7aa84488be Refactor basket_adapter 2011-12-26 10:47:47 +01:00
Romain Neutron
903809cff9 CLeanup 2011-12-21 17:48:12 +01:00
Romain Neutron
2db39e45eb WorkZone baskets templates 2011-12-21 17:42:21 +01:00
Romain Neutron
89c0009b22 Story WorkZone Element macro 2011-12-21 17:41:49 +01:00
Romain Neutron
78784ef11a Story WorkZone template 2011-12-21 17:41:40 +01:00
Romain Neutron
3b68d9370a Story Tooltip template 2011-12-21 17:41:23 +01:00
Romain Neutron
c215bb2f9f Story Create template 2011-12-21 17:41:09 +01:00
Romain Neutron
9a519b9361 Baskets templates 2011-12-21 17:40:54 +01:00
Romain Neutron
43e874e6dc Add tooltip template templates/web/prod/Tooltip/Basket.html.twig 2011-12-20 16:14:07 +01:00
Romain Neutron
d12ad8dfc0 Merge with Legoff's changes 2011-12-20 14:10:53 +01:00
Romain Neutron
8b6278cb2a Basket route 2011-12-19 19:08:44 +01:00
Romain Neutron
e1dce46c9c Basket route 2011-12-19 18:24:16 +01:00
Romain Neutron
fbe56e4936 Add 2011-12-19 17:45:30 +01:00
Romain Neutron
294c97f4f4 Basket templates 2011-12-19 17:41:33 +01:00
Romain Neutron
5941c25ae6 Refactor 2011-12-16 20:00:59 +01:00
Romain Neutron
e2ab10b47e Add new modal box 2011-12-16 17:56:12 +01:00
Romain Neutron
3ba5298761 Add New Modal box 2011-12-16 17:55:57 +01:00
Romain Neutron
90760357d7 New Objects 2011-12-16 17:22:00 +01:00
Romain Neutron
fa9eaf865e Merged with 3.5.2 2011-12-15 15:12:40 +01:00
Romain Neutron
89a8f1d380 Add type "string" to databox fields 2011-12-15 15:00:43 +01:00
Romain Neutron
32f599e6f9 Merged with 3.5.1 2011-12-15 14:22:46 +01:00
Romain Neutron
a676a8c38f Adding uncommited fixes 2011-12-15 12:50:45 +01:00
Romain Neutron
a0103c4f8a Adding uncommited fixes 2011-12-15 12:48:42 +01:00
Romain Neutron
2f16cc3192 Upgraded templates 2011-12-15 12:10:39 +01:00