199 Commits

Author	SHA1	Message	Date
Romain Neutron	70519a471a	Update copyright year	2012-04-26 02:06:29 +02:00
Romain Neutron	ade22295ad	Fix CS	2012-04-26 00:55:53 +02:00
Romain Neutron	6a4708bee5	Add debug line	2012-04-20 11:13:13 +02:00
Nicolas Le Goff	f49f816e48	Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into tools_refactor	2012-04-12 17:39:27 +02:00
Nicolas Le Goff	d6558b33ba	add pixastic and thumbExtractor to prod application	2012-04-12 17:30:33 +02:00
Nicolas Le Goff	09a6a2ee3c	add pixastic js library	2012-04-12 17:29:39 +02:00
Romain Neutron	c3d66f574d	Merge branch 'FixBasketSort' into Dev	2012-04-10 14:09:23 +02:00
Romain Neutron	96080dfd1a	Fix reorder box selection	2012-04-10 14:08:01 +02:00
Nicolas Le Goff	c953190ed6	Fix error page	2012-03-30 14:59:38 +02:00
Romain Neutron	9acaf0b211	Use Composer for dependencies instead of git submodules	2012-03-30 13:39:44 +02:00
Romain Neutron	c0dfe1657b	Merge branch 'BusinessFields' into Dev	2012-03-26 14:21:16 +02:00
Romain Neutron	1189cece49	Merge with master	2012-03-23 17:43:51 +01:00
Romain Neutron	c7632846bb	Fix Error loading	2012-03-23 17:41:24 +01:00
Romain Neutron	62caa5e10a	Implements BusinessFields in export	2012-03-22 16:38:35 +01:00
Romain Neutron	7a0495caf3	Merge with 3.6	2012-03-12 18:40:21 +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
Nicolas Le Goff	a04e1980f6	fix #435 verifier que les mails sont envoyés une fois le zip généré	2012-03-05 18:01:27 +01:00
Nicolas Le Goff	cdba407868	fix issue	2012-02-29 17:30:54 +01:00
Romain Neutron	2412c41553	GFix client publications	2012-02-28 16:02:58 +01:00
Romain Neutron	379926ccf5	Remove unused Autoload	2012-02-28 13:55:24 +01:00
Nicolas Le Goff	14f8762fcf	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 15:10:32 +01:00
Nicolas Le Goff	6ca77f84ee	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-02-23 15:08:50 +01:00
Nicolas Le Goff	079dd80e14	fix image scroll & image display	2012-02-23 15:08:09 +01:00
Romain Neutron	c29dcd94e7	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 14:54:26 +01:00
Nicolas Le Goff	db1a77e877	replace player-scroll	2012-02-23 14:35:57 +01:00
Nicolas Le Goff	bfbc51c5d2	replace player_homelink	2012-02-23 12:45:24 +01:00
Romain Neutron	1f578810f8	Fix basket download	2012-02-23 11:33:55 +01:00
Romain Neutron	65f62f9c10	Refactor Appbox	2012-02-21 16:25:40 +01:00
Romain Neutron	566b8fc6be	Refactor Appbox	2012-02-21 15:52:25 +01:00
Romain Neutron	6ba0bbe64d	Trig selectStop event on select method end	2012-02-17 17:25:59 +01:00
Romain Neutron	55e6197bf0	Lifting	2012-02-17 17:01:34 +01:00
Romain Neutron	2590ab6ddd	Add control on BasketRepo	2012-02-17 16:08:00 +01:00
Romain Neutron	9889ac720e	Fix basket tooltip display	2012-02-17 13:19:23 +01:00
Romain Neutron	400db81f28	Add notification for editing search / replace	2012-02-16 18:59:08 +01:00
Romain Neutron	3e77f99329	Add limit and custom auto-selector	2012-02-16 18:02:08 +01:00
Romain Neutron	f40915c3dd	Fix Story Export	2012-02-15 19:29:26 +01:00
Romain Neutron	24214c7d4a	Fix overlay IE7	2012-02-10 13:55:26 +01:00
Romain Neutron	ba91eddb39	Add dedicated route for user preferences	2012-02-09 16:57:16 +01:00
Romain Neutron	9b9026b173	Add method to check vocabulary / export datas	2012-02-08 16:09:57 +01:00
Nicolas Le Goff	b4e1bb6c22	update jquery.mousewheel.js from 3.2 to 3.6	2012-02-03 17:10:49 +01:00
Romain Neutron	8211396f14	Add Dialog.js to minify	2012-02-03 15:45:42 +01:00
Romain Neutron	7faa578704	Fix list saving	2012-02-03 01:25:36 +01:00
Romain Neutron	203770fdee	Fix typo	2012-02-02 16:27:44 +01:00
Romain Neutron	a9c0740b3a	Push javascript	2012-01-31 22:05:18 +01:00
Romain Neutron	99a344774f	Coding standards	2012-01-31 18:35:27 +01:00
Romain Neutron	15f533e74a	Upgraded to jQuery UI 1.8.17	2012-01-31 11:58:24 +01:00
Romain Neutron	8e0d42333b	Upgraded to jQuery UI 1.8.17	2012-01-31 11:58:08 +01:00
Romain Neutron	fd94d296f8	Upgraded to jQuery UI 1.8.17	2012-01-31 11:57:44 +01:00
Romain Neutron	d0b1a40584	Upgrade code to Phraseanet Alerts	2012-01-31 11:39:29 +01:00