99 Commits

Author	SHA1	Message	Date
Florian BLOUET	f186091823	wip: component reorg, gathering js, css, images, ...	2015-12-02 17:35:36 +01:00
Benoît Burnichon	eefd1432ed	Fix some translation errors	2015-10-29 22:53:17 +01:00
Benoît Burnichon	f64e3afa63	Use voters in workzone, actionbar and basket_actionbar	2015-10-28 14:43:24 +01:00
Florian BLOUET	831436f6fe	updated existing plugin interfaces, added basket actionbar plugin interface	2015-10-28 12:49:02 +01:00
Florian BLOUET	41d9c18c04	update workzone for handling multiple plugins	2015-10-28 12:46:25 +01:00
Florian BLOUET	c2b8f1b957	remove accordion for plugin content tab	2015-10-28 12:15:21 +01:00
Benoît Burnichon	e3b154dc32	Add Necessary templates for plugins handling	2015-10-27 19:37:10 +01:00
Benoît Burnichon	38ae7bc2ac	Rename get_number/set_number to getNumber/setNumber	2015-07-13 17:50:20 +02:00
Benoît Burnichon	4880f2bf5a	Add getAuthenticator usage ... Replace $app['authentication']->getUser() by $app->getAuthenticatedUser() replace twig app['authentication'].getUser() with corresponding method	2015-07-02 12:33:18 +02:00
Olivier Mayer	33207d1dc2	Basket push unread ... fix #61	2015-04-07 19:17:22 +09:00
Olivier Mayer	30d9bccbf2	Issues Monday + more	2015-03-30 19:28:33 +09:00
Olivier Mayer	f9170989e7	fix #36	2015-03-24 20:38:38 +09:00
Olivier Mayer	63533323b5	Fix menu basket	2015-03-20 17:41:02 +09:00
Olivier Mayer	da10fe75d2	Basket icons ... fix #13	2015-03-20 17:35:07 +09:00
Mathieu Darse	63eaaf1596	Merge remote-tracking branch 'upstream/master' into elastic-indexer ... Conflicts: composer.lock www/scripts/apps/admin/main/app.js	2015-03-10 15:25:20 +01:00
Nicolas Le Goff	ed3ffb59a6	Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer ... Conflicts: bin/console bower.json composer.json composer.lock lib/Alchemy/Phrasea/Application.php lib/Alchemy/Phrasea/Border/Manager.php lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Core/PhraseaEvents.php lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php lib/classes/caption/field.php lib/classes/record/Interface.php templates/web/prod/index.html.twig www/skins/prod/000000/prodcolor.css	2015-03-10 14:36:31 +01:00
Olivier Mayer	2df0a404ea	Menu trigger icon	2015-03-10 19:19:10 +09:00
Nicolas Le Goff	75a6bbe608	Fix status display	2015-02-24 15:28:29 +01:00
Olivier Mayer	a49acb03e4	Design update	2015-02-23 15:15:55 +09:00
Olivier Mayer	13a87a6181	Modification general layout ... Change items size, color etc	2015-02-17 00:57:45 +09:00
Nicolas Le Goff	fcdc10c554	Fix latest merge	2014-07-17 15:11:26 +02:00
Nicolas Le Goff	3565d1c795	Merge branch '3.8' into fix-latest-merge ... Conflicts: CHANGELOG.md bower.json composer.json composer.lock lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Controller/Prod/Push.php lib/Alchemy/Phrasea/Controller/Prod/Records.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Media/Subdef/Image.php lib/conf.d/_GV_template.inc locale/de_DE/LC_MESSAGES/phraseanet.mo locale/de_DE/LC_MESSAGES/phraseanet.po locale/en_GB/LC_MESSAGES/phraseanet.mo locale/en_GB/LC_MESSAGES/phraseanet.po locale/fr_FR/LC_MESSAGES/phraseanet.mo locale/fr_FR/LC_MESSAGES/phraseanet.po locale/nl_NL/LC_MESSAGES/phraseanet.mo locale/nl_NL/LC_MESSAGES/phraseanet.po templates/web/prod/Story/Reorder.html.twig templates/web/prod/WorkZone/Macros.html.twig templates/web/prod/actions/Download/prepare.html.twig templates/web/prod/templates/push.html.twig	2014-07-11 17:19:39 +02:00
Nicolas Le Goff	937752d275	PHRAS-181 #fix edit button action display according to user rights	2014-07-07 15:31:25 +02:00
Nicolas Le Goff	eaa1feb765	Address PR comments	2014-02-19 17:29:27 +01:00
Nicolas Le Goff	b341495c88	Fix tests	2014-02-19 17:29:26 +01:00
Nicolas Le Goff	4cc82af980	Fix settings	2014-02-19 17:29:26 +01:00
Nicolas Le Goff	26bd977d5f	Delete references to usr.usr_id field in entities ... Conflicts: lib/Alchemy/Phrasea/Controller/Prod/Push.php lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php lib/conf.d/migrations.yml Conflicts: lib/Alchemy/Phrasea/ACL/BasketACL.php lib/Alchemy/Phrasea/Authentication/Authenticator.php lib/Alchemy/Phrasea/Controller/Prod/Order.php lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php lib/Alchemy/Phrasea/Controller/Root/Session.php lib/Alchemy/Phrasea/Model/Entities/Basket.php lib/Alchemy/Phrasea/Model/Entities/BasketElement.php lib/Alchemy/Phrasea/Model/Entities/Feed.php lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php lib/Alchemy/Phrasea/Model/Entities/FtpExport.php lib/Alchemy/Phrasea/Model/Entities/Session.php lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php lib/Alchemy/Phrasea/Model/Entities/UsrList.php lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php lib/classes/API/V1/adapter.php templates/mobile/lightbox/sc_note.html.twig templates/web/admin/connected-users.html.twig templates/web/admin/publications/fiche.html.twig templates/web/lightbox/IE6/agreement_box.html.twig templates/web/lightbox/agreement_box.html.twig templates/web/lightbox/basket_content_report.html.twig templates/web/lightbox/sc_note.html.twig templates/web/prod/WorkZone/Browser/Basket.html.twig templates/web/prod/WorkZone/Browser/Results.html.twig templates/web/prod/WorkZone/Macros.html.twig templates/web/prod/actions/Feedback/List-Share.html.twig templates/web/prod/actions/Feedback/ListsMacros.html.twig templates/web/prod/orders/order_box.html.twig templates/web/prod/orders/order_item.html.twig templates/web/prod/upload/lazaret.html.twig tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php	2014-02-19 17:29:25 +01:00
Nicolas Le Goff	54a5d6578c	Replace getter and setter for user & user notif setting value	2014-02-19 17:28:53 +01:00
Nicolas Le Goff	c156f842c7	Remove User_Adapter	2014-02-19 17:28:53 +01:00
Romain Neutron	2ba164701d	Use symfony translator	2013-12-03 20:02:40 +01:00
Romain Neutron	16c1930ca0	Update templates to fit the new translator	2013-12-03 20:02:40 +01:00
Romain Neutron	e7421e1fdd	Fix twig tags	2013-12-03 20:02:39 +01:00
Romain Neutron	3548421160	Add basket converter	2013-11-13 17:52:12 +01:00
Romain Neutron	f39af8b64e	Merge branch '3.8'	2013-11-06 11:26:47 +01:00
Romain Neutron	b311ab7c67	Fix #1566 : Fix basket export	2013-11-05 16:00:55 +01:00
Nicolas Le Goff	43a2e75c0f	Fix tests	2013-11-05 15:33:01 +01:00
Nicolas Le Goff	1fdf30c6af	Use ACL service provider to get user's ACL	2013-11-05 12:21:42 +01:00
Romain Neutron	08ce909730	Move doctrine repositories to Phrasea namespace	2013-10-29 17:30:11 +01:00
Romain Neutron	ac5ac09ae7	Fix #1304 : Workzone elastic behavior is not working	2013-07-12 11:01:13 +02:00
Nicolas Le Goff	07bd0de688	Fix template issue	2013-06-18 17:49:59 +02:00
Nicolas Le Goff	a846a81ec2	Remove unecessary slash	2013-06-14 11:44:30 +02:00
Romain Neutron	4161ef2e31	Use url generator everywhere	2013-06-13 09:44:16 +02:00
Romain Neutron	5df6e262df	Merge pull request #313 from romainneutron/auth-providers ... [3.8] Auth providers	2013-05-29 10:44:31 -07:00
Nicolas Le Goff	fb6ed1c1fe	Fix #785 Add possibility to delete baskets from workzone browser	2013-05-29 14:29:49 +02:00
Romain Neutron	d2bc4f4a23	Add AuthenticationServiceProvider	2013-05-29 14:22:50 +02:00
Romain Neutron	a1415f5025	Merge branch '3.7'	2013-02-01 11:01:50 +01:00
Nicolas Le Goff	41f749909e	Fix #1070 : Fix basket context-menus display on IE8	2013-02-01 09:33:35 +01:00
Nicolas Le Goff	e93eb14ac2	Fix #1069 : Fix workzone titles display on IE <= 9	2013-02-01 09:33:35 +01:00
Romain Neutron	985fcd4657	Merge branch '3.7'	2012-11-09 15:03:09 +01:00
Romain Neutron	45f7a636f4	Fix #998 : do not display a validation viewer as a validation participant	2012-11-09 13:09:02 +01:00