359 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	ed4ae71819	Fix test suite	2014-02-19 17:29:25 +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	64456a8964	Remove phraseanet registry	2013-12-20 16:44:22 +01:00
Romain Neutron	09c74afab6	Merge branch '3.8' ... Conflicts: lib/Alchemy/Phrasea/Controller/Prod/Export.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Helper/Prod.php lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php lib/classes/User/Adapter.php lib/classes/caption/Field/Value.php lib/classes/collection.php lib/classes/module/report/filter.php lib/classes/task/period/ftp.php templates/web/common/dialog_export.html.twig templates/web/report/ajax_dashboard_content_child.html.twig tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php	2013-12-18 12:12:58 +01:00
Romain Neutron	aac9138b18	Fix division by 0 in case a thumbnail has a width or height equal to 0	2013-12-11 11:44:29 +01:00
Romain Neutron	e9e9d149a1	Locale simplification	2013-12-03 20:05:20 +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	3451895515	Merge branch '3.8' ... Conflicts: lib/Alchemy/Phrasea/Core/Version.php	2013-11-14 17:52:52 +01:00
Romain Neutron	84c444c186	Fix editing default user settings	2013-11-14 13:29:49 +01:00
Romain Neutron	3fbd4a7daa	Merge pull request #734 from nlegoff/acl_service ... [3.9] Add ACL as a service	2013-11-05 08:08:09 -08:00
Romain Neutron	f27fa53d4c	Merge branch '3.8' ... Conflicts: .travis.yml templates/web/setup/wrapper.html.twig tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php	2013-11-05 15:20:35 +01:00
Nicolas Le Goff	1fdf30c6af	Use ACL service provider to get user's ACL	2013-11-05 12:21:42 +01:00
Nicolas Le Goff	d28afc8d67	Fix #1556 Ajax issue when loading bridge playlists	2013-10-31 17:31:21 +01:00
Romain Neutron	baecfdceb3	Move entities to Phrasea namespace	2013-10-29 16:56:49 +01:00
Romain Neutron	212b09afa2	Merge branch '3.8' ... Conflicts: lib/Alchemy/Phrasea/Controller/Permalink.php	2013-10-25 18:50:15 +02:00
Romain Neutron	1b1c1ae877	Fix #1546 : Disallow push when records can not be pushed	2013-10-25 15:54:29 +02:00
Romain Neutron	762f758705	Merge branch '3.8' ... Conflicts: bower.json lib/Alchemy/Phrasea/Controller/Prod/Feed.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Item.php lib/classes/eventsmanager/notify/feed.php tests/classes/Feed/Entry/Feed_Entry_ItemTest.php	2013-10-24 14:05:04 +02:00
Romain Neutron	22b2dddcf8	Fix #1532 : Add checkbox on feed creation to disable email notifications	2013-10-22 11:09:29 +02:00
Romain Neutron	1dfbff5666	Merge branch '3.8' ... Conflicts: CHANGELOG.md bin/developer lib/classes/module/console/systemUpgrade.php www/skins/report/jquery-ui.css	2013-10-03 15:29:22 +02:00
Nicolas Le Goff	2a1c421110	fix #1509 Fix missing label for stories status edition	2013-10-03 12:20:27 +02:00
Romain Neutron	0d3aaf362d	Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet	2013-09-12 13:53:56 +02:00
Nicolas Le Goff	ed514432ca	Fix translation issues	2013-09-05 14:29:42 +02:00
Andrey	289c0294b2	Rebased, fixed minor bugs	2013-09-05 13:44:04 +02:00
Andrey	84300f3c92	Replaced remaining occurrences of Feed_ classes, updated tests	2013-09-05 13:44:04 +02:00
Andrey	affdfe7a0a	Implement RSSFeeds, fixed controllers implementation, fixed tests	2013-09-05 13:44:02 +02:00
Andrey	f117817e87	Implementation of doctrine entities	2013-09-05 13:43:04 +02:00
Romain Neutron	6974ca5fb9	Merge pull request #625 from nlegoff/fix_1445 ... [3.8] Fix #1445 Move record dialog improvement	2013-09-05 04:04:43 -07:00
Nicolas Le Goff	611b2ddab0	Fix #1444 Select size	2013-09-05 12:14:06 +02:00
Nicolas Le Goff	ce55141917	Fix #1445 Wording & issue while moving record from collections	2013-09-05 12:04:18 +02:00
Romain Neutron	44126841bc	Remove deprecated "on" / "off" default values	2013-07-18 19:06:49 +02:00
Romain Neutron	9032fbaed1	Update strings	2013-07-18 18:49:22 +02:00
jygaulier	56c884c852	add message if no doc editable	2013-07-18 15:28:57 +02:00
jygaulier	bf66cef3aa	"name" des sb supprimés au profit des labels traduits	2013-07-18 14:46:39 +02:00
Nicolas Le Goff	401a33ca65	Fix #1280 Css issue manager list	2013-07-12 19:28:13 +02:00
Romain Neutron	f444d4ed97	Merge pull request #491 from romainneutron/fix-1300 ... [3.8] Fix 1300	2013-07-11 09:46:22 -07:00
Romain Neutron	6e0702c9f1	Merge pull request #490 from romainneutron/fix-1279 ... [3.8] Fix #1279 : Fix "share a list" template	2013-07-11 08:49:11 -07:00
Romain Neutron	867be69b74	Fix #1300 : Story editing does not work	2013-07-11 16:17:49 +02:00
Romain Neutron	0e5b1d62a1	Fix #1279 : Fix "share a list" template	2013-07-11 15:33:37 +02:00
Romain Neutron	4e5591bb66	Fix #1298 : Preview tooltip URL has a double trailing slash	2013-07-11 12:49:41 +02:00
Nicolas Le Goff	ac6b3e439a	Fix #1218 & 1219 Enhance sharing window	2013-06-28 17:15:48 +02:00
Nicolas Le Goff	90bc96b72a	Fix tooltip + enhancement ... Adressed PR's comment Fix CSS issue	2013-06-24 15:50:59 +02:00
Nicolas Le Goff	764fa42f14	Update to jquery ui 1.10.3 ... Fix conflict & ui bugs Remove debug	2013-06-21 13:46:16 +02:00
Romain Neutron	ca519612c6	Merge pull request #415 from romainneutron/locale ... [3.8] Update locales	2013-06-18 06:33:20 -07:00
Romain Neutron	4fb39ff503	Update locales	2013-06-17 23:33:01 +02:00
Romain Neutron	241705a568	Merge pull request #399 from romainneutron/ip-proxies ... [3.8] Add trusted proxies configuration	2013-06-17 10:28:49 -07:00
Nicolas Le Goff	7c226e3349	Fix typo	2013-06-17 17:25:42 +02:00