Commit Graph

749 Commits

Author SHA1 Message Date
Romain Neutron
1b064eed11 Add MustacheLoader route 2012-01-25 11:26:17 +01:00
Romain Neutron
e0b7781698 Add mustache to prod 2012-01-25 11:24:32 +01:00
Romain Neutron
e4e930a90f Add Push controller 2012-01-25 11:24:05 +01:00
Romain Neutron
2f206e6251 Add mustache as a dependency 2012-01-25 11:21:37 +01:00
Romain Neutron
a4d3e6388e Fix Js errors 2012-01-24 15:47:12 +01:00
Romain Neutron
9563704710 Fix syntax error 2012-01-23 18:29:47 +01:00
Romain Neutron
38176ff70d New controllers rewrite rules 2012-01-23 18:17:11 +01:00
Romain Neutron
7319930d5c Removed old controllers 2012-01-23 18:16:43 +01:00
Romain Neutron
16bb162f5d Editing template 2012-01-23 12:26:33 +01:00
Romain Neutron
80df19785f Jquery edit enhancements 2012-01-20 18:49:04 +01:00
Romain Neutron
f4e03610cc Jquery edit enhancements 2012-01-20 18:48:04 +01:00
Romain Neutron
22559b0474 Jquery edit javascript 2012-01-20 15:25:07 +01:00
Romain Neutron
d38103d410 Fix subdefs controller classname 2012-01-20 15:24:03 +01:00
Romain Neutron
1d8bbd34d3 Add vocabulary settings to controller 2012-01-20 15:23:49 +01:00
jygaulier
5a5f86a97b - 2012-01-19 21:01:03 +01:00
Romain Neutron
1aadc0956c Use of JS new objects in editing 2012-01-19 17:54:57 +01:00
Romain Neutron
5b2c53a8d1 Add jquery.Edit.recordField JS in prod 2012-01-19 17:54:26 +01:00
Romain Neutron
51ed30621d Add jquery.Edit.recordField JS object 2012-01-19 17:54:10 +01:00
Romain Neutron
0d1cc50632 Merge with master 2012-01-19 12:32:57 +01:00
Romain Neutron
c7abf22256 Fix basket use of searchEngine options 2012-01-19 12:08:55 +01:00
jygaulier
e5828f06bb - 2012-01-17 12:03:41 +01:00
Romain Neutron
af860e2fa6 Merge with master 2012-01-16 20:19:20 +01:00
Romain Neutron
e4417e0048 Fix #238: transform get request into post 2012-01-16 20:02:54 +01:00
Romain Neutron
dada126f47 Add /prod/lists to rewrite rules 2012-01-13 12:10:30 +01:00
Romain Neutron
41f99bff9e Merge 2012-01-12 16:05:49 +01:00
Romain Neutron
65215d69e2 Fix collection cache name bug 2012-01-12 16:03:49 +01:00
Romain Neutron
b2ab629ebc Refactor Core::request 2012-01-12 14:27:34 +01:00
Romain Neutron
3d32dcd2ce Merge 2012-01-11 21:06:33 +01:00
Romain Neutron
3ea1e067a0 Fix wrong path 2012-01-11 21:01:59 +01:00
Romain Neutron
5779ca900b Basket Browser css 2012-01-11 21:01:28 +01:00
Romain Neutron
7689a52fef Add user.png icon 2012-01-11 21:00:54 +01:00
Romain Neutron
530e5599d6 Add push rewrite rules 2012-01-11 21:00:29 +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
Romain Neutron
78fa03a59c Merge branch 'HotFix' into 3.6 2012-01-11 15:45:08 +01:00
Romain Neutron
3d2923a627 Fix presets 2012-01-11 15:43:47 +01:00
Nicolas Le Goff
3125bdc7af Merge 2012-01-11 15:04:52 +01:00
Romain Neutron
9a761b59c3 Merge with master 2012-01-11 14:29:47 +01:00
Romain Neutron
b60daf20a8 Fix search status in client 2012-01-11 13:48:30 +01:00
Romain Neutron
7f77c19f6b Fix search status in client 2012-01-11 13:48:19 +01:00
Romain Neutron
9560192996 Fix templates with strict wariables 2012-01-11 12:55:49 +01:00
Nicolas Le Goff
d61b08ecea load connexion from connexion file 2012-01-11 12:27:34 +01:00
Romain Neutron
29b0d5d1a0 Enhancement graphique prod 2012-01-11 10:43:03 +01:00
Romain Neutron
8be9cac424 Update prod CSS 2012-01-11 10:42:18 +01:00
Romain Neutron
c239740542 Merge branch 'HotFix' into 3.6 2012-01-10 21:24:12 +01:00
Romain Neutron
43dabbe867 Fix #196 : applya template during registration removes registration on other collections 2012-01-10 20:46:08 +01:00
Romain Neutron
99ca258c1c Removed some console.log 2012-01-10 20:29:21 +01:00
Romain Neutron
3b4b04e3c6 WorkZone browser CSS 2012-01-10 20:28:42 +01:00
Romain Neutron
48ffdefc88 Add options to default dialog 2012-01-10 12:49:48 +01:00
Romain Neutron
ccf08e05eb Merge with master 2012-01-10 10:25:02 +01:00
Romain Neutron
0b27c161c5 Fix editing records 2012-01-09 20:32:58 +01:00