3336 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	29d2786e1c	Add getRessource to VocabularyControl interface	2012-02-13 17:26:33 +01:00
Nicolas Le Goff	a167363ed4	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-10 19:19:11 +01:00
Nicolas Le Goff	3afbdbd1c7	add return value for konsole kommander commands	2012-02-10 19:18:37 +01:00
Nicolas Le Goff	7f0c006730	add return value for console commands	2012-02-10 19:17:05 +01:00
Romain Neutron	2237562d21	Fix lists management	2012-02-10 18:30:06 +01:00
Romain Neutron	f1f31586c2	Enhanced UsrLists roles	2012-02-10 18:20:41 +01:00
Romain Neutron	98616a6fc0	Check subdef	2012-02-10 18:12:36 +01:00
Romain Neutron	5f877a06d6	Add check on role before list modification	2012-02-10 18:12:26 +01:00
Romain Neutron	d6e26de711	Removed unused test	2012-02-10 18:08:08 +01:00
Romain Neutron	ec195d52e4	Confirm delete of list does not close after validation	2012-02-10 17:58:26 +01:00
Romain Neutron	dd7aeed4c8	Phraseanet API 1.1 tests	2012-02-10 17:44:32 +01:00
Romain Neutron	d0d8735e4f	Phraseanet API bumps to 1.1	2012-02-10 17:44:19 +01:00
Romain Neutron	f7d872819c	Fix API metadatas	2012-02-10 17:34:01 +01:00
Romain Neutron	cb1235a329	Fix bootstraping	2012-02-10 17:26:04 +01:00
Romain Neutron	cf09fcfa48	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-10 17:11:04 +01:00
Nicolas Le Goff	6f837c7407	analyze selected environement	2012-02-10 17:10:04 +01:00
Romain Neutron	ff932493ae	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-10 17:07:10 +01:00
Nicolas Le Goff	1608f52567	add new ensure prod setting comand	2012-02-10 17:04:07 +01:00
Nicolas Le Goff	db7baf54c1	add ensureProductionSetting script	2012-02-10 16:51:52 +01:00
Nicolas Le Goff	ac1107fc39	check all configuration in a row	2012-02-10 16:51:31 +01:00
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