Commit Graph

780 Commits

Author SHA1 Message Date
Romain Neutron
b9366c3823 Add Business field to schema 2012-03-20 21:31:15 +01:00
Romain Neutron
7a82a72e30 Cleanup after merge 2012-03-20 21:29:52 +01:00
Romain Neutron
415be93920 Cleanup after merge 2012-03-20 21:29:20 +01:00
Romain Neutron
384552d4b8 Refactor set_export::getCaption 2012-03-20 19:11:09 +01:00
Romain Neutron
d1a5824c19 Merge 2012-03-20 15:53:08 +01:00
Romain Neutron
ffa2ba233e Merge 2012-03-20 15:52:36 +01:00
Romain Neutron
5ed518e423 Fix upgrade 2012-03-20 15:45:32 +01:00
Romain Neutron
9bce2cf3a5 Refactor caption serialization 2012-03-20 15:44:32 +01:00
Romain Neutron
583ee314b4 Refactor caption serialization 2012-03-20 15:42:59 +01:00
Romain Neutron
a10fb04999 Remove report::getChamp 2012-03-20 14:50:36 +01:00
Romain Neutron
4c7f3897bf Fix build 2012-03-20 13:40:00 +01:00
Romain Neutron
431966aec3 Fix upgrade process 2012-03-20 12:08:38 +01:00
Romain Neutron
cab124c838 Fix upgrade process 2012-03-20 12:05:36 +01:00
Romain Neutron
a49157b7d6 Fix build 2012-03-19 19:36:07 +01:00
Romain Neutron
e286c84eb1 Merge with Scheduler 2 branch 2012-03-19 19:14:10 +01:00
Romain Neutron
fa698fbdda Coding Standards 2012-03-19 19:04:48 +01:00
Romain Neutron
87cb0b2299 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-19 13:40:34 +01:00
Romain Neutron
2ae33de7e9 Replace https links by http links 2012-03-19 13:37:41 +01:00
Nicolas Le Goff
0b14d9584f #fix 547 mails d'information de reception d'une commande pas envoyé 2012-03-19 12:02:57 +01:00
Romain Neutron
18b0d24c20 Rollback 2012-03-15 18:30:36 +01:00
Romain Neutron
c682155b68 Fix fields 2012-03-15 18:05:21 +01:00
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
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
Romain Neutron
cdf4a33c45 Fix use of events manager 2012-03-15 14:55:36 +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
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
b83f83dd92 Add reminder 2012-03-12 18:23:44 +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
f7cc2702e2 Add notifications to feed entries 2012-03-09 15:59:04 +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
394a40f01e Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-09 00:33:43 +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