2716 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	84db7cefc5	Fix unit tests metadatas	2012-02-10 16:44:42 +01:00
Nicolas Le Goff	77bbd1035f	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-10 16:05:43 +01:00
Romain Neutron	c2e90fd2ce	Merge branch 'FixBuild' into 3.6	2012-02-10 15:39:19 +01:00
Romain Neutron	e944f39883	Fix build	2012-02-10 15:36:45 +01:00
Nicolas Le Goff	1390e8b027	Modify autoload	2012-02-10 15:09:29 +01:00
Nicolas Le Goff	510cdb193a	Story check are done even if there is no story	2012-02-10 15:09:05 +01:00
Nicolas Le Goff	d311bb8050	Modify autoload for doctrine	2012-02-10 15:08:30 +01:00
Romain Neutron	78092ccb72	Removed old style geonames cache	2012-02-10 15:03:05 +01:00
Romain Neutron	13f1467f3c	Merge with master	2012-02-10 14:48:58 +01:00
Romain Neutron	879d98b2ef	Fix tf-record_id	2012-02-10 14:37:50 +01:00
Romain Neutron	091f4ed9ad	Fix overlay IE7	2012-02-10 13:59:00 +01:00
Romain Neutron	24214c7d4a	Fix overlay IE7	2012-02-10 13:55:26 +01:00
Romain Neutron	9ed411edab	Update Terms Of Use rewrite rules	2012-02-10 13:15:54 +01:00
Romain Neutron	a17f5fa950	Moved terms Of Use as a dedicated controller	2012-02-10 12:46:05 +01:00
Romain Neutron	841d0eac49	Add some cache to geonames	2012-02-09 19:07:16 +01:00
Romain Neutron	ce1e7ecaac	Add workzone sort	2012-02-09 18:06:44 +01:00
Romain Neutron	2265884821	Fix gender selection in user admin	2012-02-09 17:32:54 +01:00
Romain Neutron	fcd2a1a4b2	Confirm collection creation	2012-02-09 17:26:43 +01:00
Romain Neutron	7323edb162	Remove attached and Deleted stories from the workzone on load	2012-02-09 17:11:21 +01:00
Romain Neutron	b4f772b2a8	Remove attached and Deleted stories from the workzone on load	2012-02-09 17:09:04 +01:00
Romain Neutron	ba91eddb39	Add dedicated route for user preferences	2012-02-09 16:57:16 +01:00
Romain Neutron	6dea14b12e	Fix load of publications at startup	2012-02-09 16:38:28 +01:00
Romain Neutron	e956fb6de1	Basket display alignment	2012-02-09 16:18:12 +01:00
Romain Neutron	2a2ed03864	Allox register with email address	2012-02-09 16:13:58 +01:00
Romain Neutron	9ad8af5d22	Fix removing document visual alert	2012-02-09 16:04:09 +01:00
Romain Neutron	a3f74e394b	Prod Display settings button	2012-02-09 15:55:23 +01:00
Romain Neutron	3b381eca72	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-09 15:47:24 +01:00
Romain Neutron	7916e8a8c7	AAdd UsrLists sharing	2012-02-09 15:46:57 +01:00
Romain Neutron	c12480bde9	AAdd UsrLists sharing	2012-02-09 15:46:25 +01:00
Romain Neutron	2f4a4251f1	AAdd UsrLists sharing	2012-02-09 15:46:03 +01:00
Romain Neutron	df590c01d5	Add Alert / Load / Refresh methods to dialogBox	2012-02-09 15:45:31 +01:00
Romain Neutron	e5ade1f61f	Add User lists share	2012-02-09 15:45:03 +01:00
Nicolas Le Goff	8e081b3f7e	fix inheritance	2012-02-09 15:18:57 +01:00
Romain Neutron	5df1558b03	Translating base_id to bas_name	2012-02-09 11:37:52 +01:00
Romain Neutron	5ebb7bb1f1	Use of p4.Dialog for moving docs	2012-02-09 11:37:39 +01:00
Romain Neutron	e42ec69219	Use of p4.Dialog for moving docs	2012-02-09 11:36:51 +01:00
Romain Neutron	d014b8581c	When changing buttons, default options are used	2012-02-09 11:36:32 +01:00
Romain Neutron	7830d9ff02	Rename file	2012-02-08 20:03:59 +01:00
Romain Neutron	34b5d3f93f	Add patch	2012-02-08 20:03:13 +01:00
Romain Neutron	5ba648b591	Add icons to editing	2012-02-08 19:38:20 +01:00
Romain Neutron	5cf548079e	Implement navigation in list editor	2012-02-08 19:28:18 +01:00
Romain Neutron	4a54d4396e	Fix bad redirection	2012-02-08 18:51:32 +01:00
Romain Neutron	a9bd1294c3	Enhanced CSS in Push badges	2012-02-08 18:44:06 +01:00
Romain Neutron	786bb0b31d	Add feedback context	2012-02-08 18:43:55 +01:00
Romain Neutron	c3c5fa6c59	Add feedback context	2012-02-08 18:40:17 +01:00
Romain Neutron	06ba35002a	Add feedback user infos	2012-02-08 18:30:23 +01:00
Romain Neutron	818941bc30	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-08 17:57:09 +01:00
Romain Neutron	60c368bcdc	Temporary removed search autocompletion	2012-02-08 17:46:02 +01:00
Romain Neutron	40ada806d9	Fix user and tooltips urls	2012-02-08 17:45:40 +01:00
Nicolas Le Goff	5cd883b815	merge	2012-02-08 17:42:16 +01:00