780 Commits

Author	SHA1	Message	Date
Romain Neutron	217d2e4db0	Fix collection cache	2012-01-09 18:24:32 +01:00
Romain Neutron	e4016ccd2f	Fix User_Adapter in preview short history	2012-01-09 18:07:01 +01:00
Romain Neutron	465ded9c9f	Reverted composer.json	2012-01-09 14:48:28 +01:00
Romain Neutron	ad22cd791e	Merge branch 'templates' into 3.6	2012-01-06 18:14:22 +01:00
Romain Neutron	927eb16070	Fix template name	2012-01-06 17:59:42 +01:00
Romain Neutron	3b8d31eb64	get_applied_template returns template login	2012-01-06 17:52:45 +01:00
Romain Neutron	be2f50e903	Merge with master	2012-01-06 17:42:11 +01:00
Romain Neutron	8768f86926	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-06 17:34:10 +01:00
Romain Neutron	b0e90f0df1	Fix #166 : empty cache on subdef generation	2012-01-06 17:26:26 +01:00
Nicolas Le Goff	9c334f2ed1	delete supertwig	2012-01-06 16:56:01 +01:00
Nicolas Le Goff	47f3ba2520	merge	2012-01-06 16:55:10 +01:00
Nicolas Le Goff	87eee16cde	add twig service	2012-01-06 16:34:00 +01:00
Nicolas Le Goff	85a78052ea	fix error with gd resizer processor	2012-01-06 16:33:33 +01:00
Nicolas Le Goff	554e657d68	add twig service	2012-01-06 16:32:45 +01:00
Nicolas Le Goff	7963d0aec8	add todo	2012-01-06 16:32:19 +01:00
Romain Neutron	e3e8e49cf0	Fix searchEngine set date	2012-01-06 16:05:14 +01:00
Romain Neutron	5b7e000013	Fix #172 : Fix CGU to confirm without access	2012-01-06 15:59:15 +01:00
Romain Neutron	b4f8fa1e96	Fix : time limited users appears phantom	2012-01-06 15:43:24 +01:00
Romain Neutron	75f0e416dc	User Query on sbas or bas should not return phantom users	2012-01-06 15:43:01 +01:00
Romain Neutron	2a16efd4bc	User Query on sbas or bas should not return phantom users	2012-01-06 15:00:14 +01:00
Romain Neutron	1977eedfac	User Query on sbas or bas should not return phantom users	2012-01-06 14:50:23 +01:00
Romain Neutron	d933c64b2f	Use of secured scheme for external apis in case of https	2012-01-06 14:42:41 +01:00
Romain Neutron	8f16962873	Merge branch 'hotfix' into 3.6	2012-01-06 13:35:52 +01:00
Romain Neutron	e7bab79c85	Cleanup (oups)	2012-01-06 13:34:31 +01:00
Romain Neutron	64ce815e81	Merge with master	2012-01-06 13:30:56 +01:00
Romain Neutron	a1624c4a6b	Adding todo	2012-01-06 13:17:35 +01:00
Romain Neutron	d9b611cceb	Fix download IE6	2012-01-06 13:14:53 +01:00
Romain Neutron	5d0965f48f	Fix Query on user name	2012-01-05 17:29:15 +01:00
Romain Neutron	f7e301abf7	Vendor pathes	2012-01-05 16:45:29 +01:00
Romain Neutron	a709129824	Merge with master	2012-01-05 14:56:13 +01:00
Romain Neutron	50df11cf3c	Fix #158 : wrong mail title for validation report	2012-01-05 13:57:49 +01:00
Romain Neutron	49ca2cbdd9	Fix #160 : push username filter	2012-01-05 12:39:12 +01:00
Romain Neutron	9a10f70859	Fix #159 : push search filters	2012-01-05 12:37:26 +01:00
Romain Neutron	e5648b9335	Fix update users details	2012-01-05 12:36:41 +01:00
Romain Neutron	edbd247a89	Fix new path w/ composer	2012-01-05 11:54:06 +01:00
Romain Neutron	5b05f8c021	Merge	2012-01-04 23:07:30 +01:00
Romain Neutron	2a04b951e1	Fix Bad link	2012-01-04 22:44:24 +01:00
Romain Neutron	096d6e4002	Fix unserialization	2012-01-04 22:43:44 +01:00
Romain Neutron	a38f256c2b	Fix guest allowed	2012-01-04 19:30:31 +01:00
Romain Neutron	f5be57c202	Fix guest allowed	2012-01-04 19:28:01 +01:00
Romain Neutron	3e2ec0d385	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 18:08:44 +01:00
Romain Neutron	b1710cabb6	Merge branch 'regs' into 3.6	2012-01-04 18:08:33 +01:00
Romain Neutron	d04ba1e76c	Add exception verbosity	2012-01-04 18:05:40 +01:00
Romain Neutron	9835fa1ff7	Fix #155 : wrong stories caption	2012-01-04 18:03:38 +01:00
Nicolas Le Goff	0688a9f58a	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 17:55:16 +01:00
Nicolas Le Goff	0ebb8b0908	merge	2012-01-04 17:04:15 +01:00
Romain Neutron	30e4b37888	Merge with master	2012-01-04 16:24:47 +01:00
Romain Neutron	4159aeb720	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 16:19:45 +01:00
Romain Neutron	4535c35e9a	Fix Bug : some rights applied to templates are wrong	2012-01-04 15:40:28 +01:00
Nicolas Le Goff	bf840a8c04	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 15:20:05 +01:00