1702 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Romain Neutron	6b003bbe92	Enhancement of the answers status bar	2012-02-03 12:58:56 +01:00
Romain Neutron	9ec5c9c45e	New push 16px icon	2012-02-03 12:58:34 +01:00
Romain Neutron	eba34c7150	Enhancement of answers status bar	2012-02-03 12:58:16 +01:00
Romain Neutron	829050bec0	Push icon	2012-02-03 12:32:31 +01:00
Romain Neutron	358ed226ec	Fix css file path	2012-02-03 01:53:23 +01:00
Romain Neutron	7faa578704	Fix list saving	2012-02-03 01:25:36 +01:00
Romain Neutron	a8b6260c3b	Fix #296	2012-02-02 20:43:55 +01:00
Romain Neutron	03988283b3	Fix #299	2012-02-02 19:58:46 +01:00
Romain Neutron	254801fda0	Fix #294	2012-02-02 19:45:28 +01:00
Romain Neutron	93b6921e9b	Fix #295	2012-02-02 19:20:26 +01:00
Romain Neutron	117329b732	Fix list editor template	2012-02-02 19:12:30 +01:00
Romain Neutron	cd2549ca17	Fix prod basket CSS overflow	2012-02-02 19:08:46 +01:00
Romain Neutron	548ddc14e5	Fix build	2012-02-02 19:02:08 +01:00
Romain Neutron	d1caf754cf	Upgraded locales to the latest version	2012-02-02 18:18:36 +01:00
Romain Neutron	985c30c676	Fix template	2012-02-02 16:35:33 +01:00
Romain Neutron	0c8a7ac84e	Removed console.log	2012-02-02 16:31:31 +01:00
Romain Neutron	203770fdee	Fix typo	2012-02-02 16:27:44 +01:00
Romain Neutron	97bf29a5f2	Fix language detection	2012-02-02 16:19:27 +01:00
Romain Neutron	6935f1ac6e	Cleaning version	2012-02-02 15:56:33 +01:00
Romain Neutron	a9c7ed23cb	Coding standards	2012-02-02 15:43:12 +01:00
Romain Neutron	879166bbe1	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-02 15:26:15 +01:00
Romain Neutron	b3b53372c0	Push cleanup	2012-02-02 15:25:22 +01:00
Romain Neutron	8f52f9a6b2	Push & Feedback templates	2012-02-02 15:23:31 +01:00
Romain Neutron	4bff04671f	Push & Feedback templates	2012-02-02 15:22:36 +01:00
Romain Neutron	5e61a35eb0	Push & Feedback templates	2012-02-02 15:22:13 +01:00
Romain Neutron	9135de65cf	Push & Feedback templates	2012-02-02 15:21:51 +01:00
Romain Neutron	5439b3450c	Added User_Query::get_total_page method and various paramaters for query ( Activity/Templates/Position/Country/Company)	2012-02-02 11:29:45 +01:00