Commit Graph

2716 Commits

Author SHA1 Message Date
Romain Neutron
8e64da10e4 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-13 12:01:53 +01:00
Romain Neutron
037b7985fe Merge with master 2012-03-13 12:01:21 +01:00
Romain Neutron
fc4e1b3d91 Fix add in basket 2012-03-13 11:44:25 +01:00
Romain Neutron
90633ee61f Fix add in basket 2012-03-13 11:41:57 +01:00
Nicolas Le Goff
95d25f8aec Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-12 18:43:02 +01:00
Nicolas Le Goff
f4249bda0b fix css issue 2012-03-12 18:42:50 +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
Nicolas Le Goff
bea7e4a371 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-12 18:15:21 +01:00
Romain Neutron
ea3ff89416 Fix mobile app 2012-03-12 18:14:12 +01:00
Nicolas Le Goff
c3fda09044 fix capcha home page 2012-03-12 18:13:54 +01:00
Romain Neutron
79fdbe4f02 Fix basket element order 2012-03-12 17:56:01 +01:00
Nicolas Le Goff
89e47e15c6 Fix IE7 overflows 2012-03-12 17:40:14 +01:00
Romain Neutron
35995034cf Fix index overflow 2012-03-12 17:29:31 +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
9a8080d54d Integrate new commands in KonsoleKommander 2012-03-12 16:53:31 +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
20a771ae37 Remove to files from the build 2012-03-09 12:46:40 +01:00
Romain Neutron
b75205a807 Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-03-09 11:54:20 +01:00
Romain Neutron
41ee30fc8b Bump to version 3.5.13 3.5.13 2012-03-09 11:54:00 +01:00
Romain Neutron
81e7b2c082 Bump to version 3.6.0.0RC1 3.6.0.0RC1 2012-03-09 11:52:30 +01:00
Romain Neutron
e3429ec5f6 Update proposition 2012-03-09 11:50:23 +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
e559ca6520 Add DS_Store to gitignore 2012-03-08 17:42:04 +01:00
Ysolyne Gresille
0e838def33 Fix Oauth2 2012-03-08 17:40:28 +01:00
Ysolyne Gresille
92b7798ea6 graphic integration Oauth Pages (correction for devices) 2012-03-08 17:35:48 +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
Nicolas Le Goff
41f037511d Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-08 16:20:47 +01:00
Nicolas Le Goff
4f70076d2b fix #525 add image tooltip 2012-03-08 16:20:34 +01:00
Romain Neutron
fb060cd8cf Fix insert coll 2012-03-08 16:16:53 +01:00
Romain Neutron
f8d71a9bca Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-08 14:35:22 +01:00
Romain Neutron
68f3acfd9f Fix locales 2012-03-08 14:34:58 +01:00