1278 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	b82f8e7171	New Adv Search	2012-02-08 11:22:41 +01:00
Romain Neutron	783804b8db	updated vendors	2012-02-08 10:42:02 +01:00
Romain Neutron	15459bafb6	New Adv Search	2012-02-07 19:58:43 +01:00
Romain Neutron	730ae07830	New Adv Search	2012-02-07 19:58:20 +01:00
Romain Neutron	289180e02b	New Adv Search	2012-02-07 19:58:05 +01:00
Romain Neutron	64a48abac2	New Adv Search	2012-02-07 19:57:39 +01:00
Romain Neutron	df79449579	New Adv Search	2012-02-07 19:56:58 +01:00
Romain Neutron	b16f5d63ab	Fix ACL	2012-02-07 19:54:59 +01:00
Romain Neutron	b0c2c098fe	Merge with master	2012-02-07 19:46:23 +01:00
Romain Neutron	d3eee39ddd	Fix bug cache replication	2012-02-07 19:43:44 +01:00
Jonathan SCHNEIDER	f2c5dbb792	Update comments and print	2012-02-07 19:11:54 +01:00
Romain Neutron	26a1e3b916	Revert bad merge	2012-02-07 18:02:23 +01:00
Romain Neutron	d475e00cfa	Merge with master	2012-02-07 17:47:39 +01:00
Romain Neutron	fb2b423cd8	Fix #320	2012-02-07 17:24:52 +01:00
Romain Neutron	d0642b40ce	Fix #319	2012-02-07 17:02:38 +01:00
Romain Neutron	dfa39b8f1e	Fix bugs	2012-02-07 16:54:19 +01:00
Romain Neutron	5b28333da5	Merge with master	2012-02-07 14:51:36 +01:00
Romain Neutron	07d79f758b	Merge with master	2012-02-07 14:30:00 +01:00
Romain Neutron	3f9cf2c7a0	Fix autoregister	2012-02-07 13:25:22 +01:00
Romain Neutron	3751d540f0	Add launchpad <=> phraseanet tools	2012-02-06 13:27:08 +01:00
Romain Neutron	b30f335107	Removed Doctrine Proxies from coding standards chack utility	2012-02-06 13:25:32 +01:00
Romain Neutron	a3dc2062ee	Coding standards	2012-02-06 13:25:06 +01:00
Romain Neutron	933430c941	Upgrade locales language header	2012-02-06 13:06:10 +01:00
Romain Neutron	a725a340b7	Upgrade locales	2012-02-06 13:00:12 +01:00
Romain Neutron	7ba0a6cf3a	Removes PHPUnit annotations	2012-02-06 12:25:00 +01:00
Romain Neutron	624213f1c0	Fix build	2012-02-06 12:02:29 +01:00
Romain Neutron	662f45bdea	Fix typo	2012-02-03 18:46:15 +01:00
Nicolas Le Goff	5a958c14c3	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-03 18:43:12 +01:00
Nicolas Le Goff	47d2c433cd	fix build & add loader classes	2012-02-03 18:42:33 +01:00
Romain Neutron	da270a5fb5	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-03 18:12:53 +01:00
Romain Neutron	cf8129919d	Refactor jquery dialogs	2012-02-03 18:12:13 +01:00
Nicolas Le Goff	b4e1bb6c22	update jquery.mousewheel.js from 3.2 to 3.6	2012-02-03 17:10:49 +01:00
Nicolas Le Goff	2a1376f7e1	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-03 16:17:10 +01:00
Romain	e71210c612	Merge pull request #24 from jschne/3.6 ... 3.6	2012-02-03 07:15:07 -08:00
Nicolas Le Goff	631c48804c	change redirect access_user from index.php to /	2012-02-03 16:14:33 +01:00
Nicolas Le Goff	90e8004fb8	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-03 16:11:06 +01:00
Nicolas Le Goff	f7cb1688c7	Change redirection from index.php to /	2012-02-03 16:10:55 +01:00
Nicolas Le Goff	683fb4cd4e	Moved gatekeeper from core to bootstrap	2012-02-03 16:10:32 +01:00
Jonathan SCHNEIDER	6731daf257	fix ant script	2012-02-03 15:54:11 +01:00
Romain Neutron	bedb6fc181	Add language	2012-02-03 15:46:32 +01:00
Romain Neutron	38dbf4b4b9	Use of new Dialog.js	2012-02-03 15:46:16 +01:00
Romain Neutron	8211396f14	Add Dialog.js to minify	2012-02-03 15:45:42 +01:00
Romain Neutron	1358bf89d0	Refactor modal dialogs CSS	2012-02-03 15:45:11 +01:00
Romain Neutron	5ffb6512cc	Refactor modal dialogs	2012-02-03 15:44:34 +01:00
Jonathan SCHNEIDER	727f686836	add phantomjs tester	2012-02-03 15:35:15 +01:00
Nicolas Le Goff	6a437a3831	fix #312 subdef structure for a preview is duplicate	2012-02-03 15:32:52 +01:00
Romain Neutron	94cdafe9e8	Use of new push icons	2012-02-03 13:00:47 +01:00
Romain Neutron	e9b3e2bb98	Removed bad case pix	2012-02-03 13:00:33 +01:00
Romain Neutron	3e0ddf5e13	Use of new push icons	2012-02-03 13:00:09 +01:00
Romain Neutron	abb830ba5a	Remove the active class on unactive baskets	2012-02-03 12:59:12 +01:00