Commit Graph

1184 Commits

Author SHA1 Message Date
Romain Neutron
2fbbe3fbbe removed test DB 2012-01-31 23:02:13 +01:00
Romain Neutron
35da359350 Fix build 2012-01-31 23:01:35 +01:00
Romain Neutron
6d9dde4575 Merge 2012-01-31 22:23:00 +01:00
Romain Neutron
067561a734 Merge with master 2012-01-31 22:22:54 +01:00
Romain Neutron
406db0c4e1 Add languages 2012-01-31 22:04:00 +01:00
Romain Neutron
3e9ad6a63f Refactor namespace 2012-01-31 22:03:51 +01:00
Romain Neutron
012c65125d Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-01-31 20:31:23 +01:00
Romain Neutron
23ac371f50 Bump to version 3.5.10 2012-01-31 20:28:55 +01:00
jygaulier
5feebb8355 Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-01-31 20:06:55 +01:00
jygaulier
d5137d991e Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-31 19:54:45 +01:00
jygaulier
d86657c633 fix #262 : archive task / waiting for a 'magic file' in any subfolder locked whole archiving 2012-01-31 19:32:24 +01:00
jygaulier
ab44742882 fix #262 : archive task / waiting for a 'magic file' in any subfolder locked whole archiving 2012-01-31 19:30:40 +01:00
Romain Neutron
99a344774f Coding standards 2012-01-31 18:35:27 +01:00
Romain Neutron
f94dce8571 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-31 18:29:07 +01:00
Romain Neutron
1626246f7f Merge with master 2012-01-31 18:28:49 +01:00
Romain Neutron
b80b1ce76c Use of default query for guest users 2012-01-31 17:37:29 +01:00
Romain Neutron
ff21840b67 Fix glitch 2012-01-31 17:37:02 +01:00
Nicolas Le Goff
50af32532e correct rfc oauth2.0 V9 issue, scope and state value are no more provided if not filled in authorization response 2012-01-31 17:05:44 +01:00
Romain Neutron
716f377fdd User who can change status can see hidden status 2012-01-31 16:58:39 +01:00
Romain Neutron
6a3c186e2a Fix datetime format 2012-01-31 16:45:22 +01:00
Romain Neutron
f060323941 Fix cached desynchro 2012-01-31 15:57:50 +01:00
Nicolas Le Goff
05452bef0e remove var_dump 2012-01-31 12:36:11 +01:00
Nicolas Le Goff
ba84c9ea77 fix twig strict variable issue 2012-01-31 12:35:12 +01:00
Romain Neutron
f06ed9d8b1 Merge with master 2012-01-31 12:10:48 +01:00
Romain Neutron
4dcb569cea Merge with master 2012-01-31 12:10:03 +01:00
Romain Neutron
afb42193e7 Merge with master 2012-01-31 12:09:07 +01:00
Romain Neutron
d28e9227c2 Fix Coding standards 2012-01-31 11:55:10 +01:00
Romain Neutron
4fdf00bd7f Fix Coding standards 2012-01-31 11:54:31 +01:00
Romain Neutron
bb0b958830 Fix Coding standards 2012-01-31 11:54:22 +01:00
Romain Neutron
916cc03377 Update proxy 2012-01-31 11:53:13 +01:00
Romain Neutron
6f18aa0c88 Improved UsrLists methods 2012-01-31 11:46:29 +01:00
Romain Neutron
8d85ad9521 Improved push methods 2012-01-31 11:45:57 +01:00
Romain Neutron
1b5d9708c5 Added a new default twig filter "get_class" 2012-01-31 11:44:47 +01:00
Romain Neutron
69abf305d4 Removed sleep connections 2012-01-31 11:33:35 +01:00
Romain Neutron
b171c298d0 Add unique constraint fir a usr in a list 2012-01-31 11:31:39 +01:00
Romain Neutron
c645049e33 Add \Repositories\UsrListEntryRepo::findEntryByListAndUsrId method 2012-01-31 11:31:01 +01:00
Romain Neutron
f1a817098a Add \Entities\UsrList::has method 2012-01-31 11:29:59 +01:00
Nicolas Le Goff
98abdcb1d3 fix build 2012-01-30 17:22:36 +01:00
Nicolas Le Goff
c4f14a8f05 delete prod module 2012-01-30 17:02:35 +01:00
Nicolas Le Goff
3db335e4c1 add language controller 2012-01-30 17:00:36 +01:00
Romain Neutron
190b5992ff Cleaning opened connections 2012-01-30 12:00:34 +01:00
Nicolas Le Goff
05826fbf73 merge feed testes 2012-01-30 09:21:23 +01:00
Nicolas Le Goff
9376144dbf fix #274 add intl & twig extension in check::system 2012-01-27 19:40:23 +01:00
Nicolas Le Goff
02e7525ccd fix testDelete & testDeleteNotFound 2012-01-27 18:40:57 +01:00
Nicolas Le Goff
c50cdc097c merge 2012-01-27 17:20:10 +01:00
Nicolas Le Goff
09f3ea4cfb #fix 279 check params for controllers 2012-01-27 17:17:52 +01:00
Nicolas Le Goff
694f943d23 complete admin controller tests 2012-01-27 17:16:50 +01:00
Romain Neutron
2394d79971 Fix build 2012-01-26 19:45:25 +01:00
Romain Neutron
b299e7d042 Fix build 2012-01-26 19:12:51 +01:00
Nicolas Le Goff
7099059f0b Fix core configuration test 2012-01-26 18:23:29 +01:00