Commit Graph

1671 Commits

Author SHA1 Message Date
Nicolas Le Goff
8b6bf7cff2 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-15 16:44:01 +01:00
Nicolas Le Goff
bb634bb31d fix build 2012-03-15 16:43:36 +01:00
Nicolas Le Goff
5557d8b8b7 refactor service interface 2012-03-15 16:43:23 +01:00
Romain Neutron
196b8b17ef Merge branch 'FixStamp' into 3.6 2012-03-15 15:33:19 +01:00
Romain Neutron
d654525e81 Fix Stamp 2012-03-15 15:30:14 +01:00
Romain Neutron
ca2bcda6cc Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-15 15:15:13 +01:00
Nicolas Le Goff
7aac757a3c Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-15 15:15:00 +01:00
Nicolas Le Goff
6538cc279f change to new interface 2012-03-15 15:14:55 +01:00
Romain Neutron
cdf4a33c45 Fix use of events manager 2012-03-15 14:55:36 +01:00
Romain Neutron
990e33e6ce Remove cache service 2012-03-15 14:40:10 +01:00
Romain Neutron
c6aad35bef Cleanup 2012-03-15 14:39:30 +01:00
Romain Neutron
0d996d6105 Code Cleanup 2012-03-15 14:37:40 +01:00
Romain Neutron
a11846cabe Coding Standards 2012-03-15 14:36:56 +01:00
Romain Neutron
a917934595 Cleanup 2012-03-15 14:36:32 +01:00
Romain Neutron
78db649450 Coding Standards 2012-03-15 14:13:38 +01:00
Romain Neutron
d856b7b380 Cleanup 2012-03-15 14:13:11 +01:00
Romain Neutron
d0ff7cd102 Enhanced user queries 2012-03-15 14:02:19 +01:00
Nicolas Le Goff
aace1a0847 add check for binary 2012-03-13 14:58:08 +01:00
Nicolas Le Goff
d2e2b6d35c Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-13 14:48:49 +01:00
Nicolas Le Goff
85292715de fix appbox::get_instance issue 2012-03-13 14:47:43 +01:00
Romain Neutron
871a3511ec Add multiple word queries for users 2012-03-13 12:39:54 +01:00
Romain Neutron
7a0495caf3 Merge with 3.6 2012-03-12 18:40:21 +01:00
Romain Neutron
b84ad68a20 Coding standards 2012-03-12 18:24:49 +01:00
Romain Neutron
b83f83dd92 Add reminder 2012-03-12 18:23:44 +01:00
Romain Neutron
79fdbe4f02 Fix basket element order 2012-03-12 17:56:01 +01:00
Romain Neutron
6c6706c5a7 Add element to a basket automactically add participant to validation session 2012-03-12 17:23:20 +01:00
Romain Neutron
aede5888b8 Fix basket : elements are nt retrive by order 2012-03-12 17:19:24 +01:00
Romain Neutron
da054b4275 Merge with master 2012-03-12 17:06:57 +01:00
Romain Neutron
a4501fc442 Add flag to keep dots 2012-03-12 16:56:57 +01:00
Romain Neutron
c1699b6b82 Add method to rename all metadatas 2012-03-12 16:56:32 +01:00
Romain Neutron
c034c0fcf1 Remove unused getargs file 2012-03-12 16:55:50 +01:00
Romain Neutron
57184ca48b Add commandline extension check 2012-03-12 16:53:13 +01:00
Romain Neutron
a506faa4e5 Add commands to manage databox fields command line 2012-03-12 16:53:02 +01:00
Romain Neutron
7992bbb8d8 Refactor sphinx suggestion builder 2012-03-12 16:52:49 +01:00
Romain Neutron
2db42f22fb Fix description 2012-03-12 16:52:35 +01:00
Romain Neutron
4d8664de2e Refactor dump base 2012-03-12 16:50:17 +01:00
Romain Neutron
ffd452603c Fix upgrader 2012-03-09 16:12:13 +01:00
Romain Neutron
f7cc2702e2 Add notifications to feed entries 2012-03-09 15:59:04 +01:00
Romain Neutron
c36f6e3f7c Fix build 2012-03-09 15:39:22 +01:00
Romain Neutron
d79c13f8c2 Refactor random::TYPE_* Constants 2012-03-09 15:12:23 +01:00
Romain Neutron
8761e04eda Add notifications to feed publications 2012-03-09 15:07:18 +01:00
Romain Neutron
82d9eeef7b Coding standards 2012-03-09 12:49:13 +01:00
Romain Neutron
41ee30fc8b Bump to version 3.5.13 2012-03-09 11:54:00 +01:00
Romain Neutron
81e7b2c082 Bump to version 3.6.0.0RC1 2012-03-09 11:52:30 +01:00
Romain Neutron
394a40f01e Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-09 00:33:43 +01:00
Romain Neutron
2c5fab4da7 Fix presentation 2012-03-09 00:32:53 +01:00
Romain Neutron
1f3ad530ae Remove unwanted hydration 2012-03-08 19:07:04 +01:00
Ysolyne Gresille
0e838def33 Fix Oauth2 2012-03-08 17:40:28 +01:00
Ysolyne Gresille
429a1bef9b Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-08 17:27:47 +01:00
Romain Neutron
fb060cd8cf Fix insert coll 2012-03-08 16:16:53 +01:00