Commit Graph

849 Commits

Author SHA1 Message Date
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
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
69abf305d4 Removed sleep connections 2012-01-31 11:33:35 +01:00
Nicolas Le Goff
c4f14a8f05 delete prod module 2012-01-30 17:02:35 +01:00
Romain Neutron
190b5992ff Cleaning opened connections 2012-01-30 12:00:34 +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
c50cdc097c merge 2012-01-27 17:20:10 +01:00
Nicolas Le Goff
694f943d23 complete admin controller tests 2012-01-27 17:16:50 +01:00
Romain Neutron
b299e7d042 Fix build 2012-01-26 19:12:51 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
56fc13c5bb Removed a space 2012-01-25 19:14:48 +01:00
Romain Neutron
81631e1bbc Removed debug 2012-01-25 18:54:12 +01:00
Romain Neutron
de5ffe76ae Cleanup 2012-01-25 18:47:04 +01:00
Romain Neutron
fc1a0abb19 Cleanup 2012-01-25 18:45:28 +01:00
Romain Neutron
e1c95b49a5 Merge with master 2012-01-25 17:25:25 +01:00
Romain Neutron
b13874e023 Fix build 2012-01-25 17:12:12 +01:00
Romain Neutron
65f5098bbb Fix readonly fields 2012-01-25 15:34:58 +01:00
Romain Neutron
1ce52264fb Fix readonly fields 2012-01-25 15:27:08 +01:00
Romain Neutron
9852e2077c Meta writer 2012-01-25 15:09:02 +01:00
Romain Neutron
4c8597f811 Fix stamper 2012-01-25 13:04:05 +01:00
Romain Neutron
7e0adec7a4 Fix story default image 2012-01-25 12:49:32 +01:00
Romain Neutron
d2b5846de6 Fix mail activation 2012-01-25 12:04:18 +01:00
Romain Neutron
7d1e0aabf6 Exclude <ul> and <li> to strip_tags in mails 2012-01-25 11:37:20 +01:00
Nicolas Le Goff
23476b1767 fix set_metadatas 2012-01-23 19:54:10 +01:00
Nicolas Le Goff
6d31db1ae4 merge 2012-01-23 19:17:08 +01:00
Romain Neutron
ca252d8564 Moved vocabulary to Alchemy namespace 2012-01-23 18:19:07 +01:00
Romain Neutron
a4c103fa42 Moved vocabulary to Alchemy namespace 2012-01-23 18:18:49 +01:00
Nicolas Le Goff
f83be86c88 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-20 16:09:45 +01:00
Nicolas Le Goff
d46974948f cleanup 2012-01-20 16:08:54 +01:00
Romain Neutron
7d98dc7f27 Refactor databox_field :: name generation 2012-01-20 15:53:18 +01:00
Romain Neutron
3e8ed50f97 Databox field vocabulary classes 2012-01-20 15:19:50 +01:00
Romain Neutron
d2e8893a46 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-20 13:00:17 +01:00
Romain Neutron
72bee22918 Add databox_field vocabularies 2012-01-20 13:00:12 +01:00
Nicolas Le Goff
ec7b3837ca convert numeric characters to int when unserializing json 2012-01-20 12:34:14 +01:00
Nicolas Le Goff
64831e19fb cleanup 2012-01-20 12:32:03 +01:00
Nicolas Le Goff
2c2a9c4494 add missing parentheses 2012-01-20 12:27:19 +01:00
jygaulier
5a5f86a97b - 2012-01-19 21:01:03 +01:00
Nicolas Le Goff
d55516bb29 fix #243 set proper cache according to php cache extensions available 2012-01-19 19:00:48 +01:00
Nicolas Le Goff
2b38f37c11 merge 2012-01-19 16:22:06 +01:00
Nicolas Le Goff
ed90b1fa4d replace path to test sqlite database with realpath 2012-01-19 16:16:47 +01:00
Nicolas Le Goff
9fc05289a5 get services from new service builder 2012-01-19 16:16:22 +01:00
Romain Neutron
0d1cc50632 Merge with master 2012-01-19 12:32:57 +01:00
Romain Neutron
8b15f3b732 Fix granted bases order 2012-01-19 12:24:09 +01:00
Romain Neutron
0ba1d57340 Fix masks on ACL transfer 2012-01-19 10:51:43 +01:00
Romain Neutron
162ab83513 caption_field refactor 2012-01-18 20:15:35 +01:00
Romain Neutron
c1bfe45931 Proper record removal 2012-01-18 19:53:14 +01:00