hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

97 Commits

Author SHA1 Message Date
Nicolas Le Goff
c477c254e6 Fix use statement 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
c5d803ac26 Add Application Manipulator 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
e99b49d191 Add Account Manipulator 2014-03-24 12:28:14 +01:00
Nicolas Le Goff
e317f86c51 Fix CS 2014-03-23 23:07:01 +01:00
Nicolas Le Goff
4af7dbddb1 Transform thesaurus preset into doctrine Entity 2014-03-06 01:31:43 +01:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +01:00
Nicolas Le Goff
1d8b6edc46 Use user manipulator to log user query 2014-03-04 19:53:07 +01:00
Romain Neutron
1713c23c59 Merge branch '3.8' 
Conflicts:
	bin/console
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/User/Adapter.php
	lib/classes/media/Permalink/Adapter.php
	lib/classes/media/abstract.php
	lib/classes/media/subdef.php
	lib/classes/p4file.php
	lib/classes/record/preview.php
	lib/conf.d/_GV_template.inc
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/FileServeServiceProviderTest.php
	tests/classes/media/Permalink/media_Permalink_AdapterTest.php
 2014-03-03 17:00:17 +01:00
Romain Neutron
92a4c35340 Substitute random string generator by Randomlib 2014-03-02 21:13:57 +01:00
Romain Neutron
894c5fe620 Fix unit tests 2014-03-01 14:37:56 +01:00
Romain Neutron
13e661c4b0 Remove ManipulatorInterface::getRepository method 2014-02-28 20:02:38 +01:00
Nicolas Le Goff
241c31a26b Merge pull request #987 from romainneutron/users-wording 
[3.9] Fix users modelOf and lastModel wording
 2014-02-28 12:56:05 +01:00
Romain Neutron
9536aacab7 Fix users modelOf and lastModel wording 2014-02-28 03:03:53 +01:00
Nicolas Le Goff
5d1dce1a99 Merge pull request #977 from romainneutron/fix-live-notifier 
[3.9] Improve live notifier
 2014-02-28 00:28:47 +01:00
Romain Neutron
3a47b922ed Improve notifier 2014-02-27 15:49:15 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
b32e4c6158 Rename RegistrationManager to RegistrationManipulator 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
5f355218a8 Login is not longer modified when user is deleted 2014-02-20 15:06:25 +01:00
Nicolas Le Goff
058a4f1c3e Use manipulator.user to delete users 2014-02-20 15:06:25 +01:00
Nicolas Le Goff
2973513519 Fix user migration 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
3b0fe2eb75 Fix CS 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
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
678f741660 Use Short Array notation 2014-02-19 17:28:54 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Romain Neutron
354232f61a Bump copyright year 2014-01-06 15:40:56 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
d40b1d4fb1 Fix CS 2013-11-18 13:07:40 +01:00
Romain Neutron
cab32f870c Merge pull request #765 from nlegoff/reset_sys_admin_right 
[3.9] Add ACL manipulator && Refactor reset sys admin rights
 2013-11-11 01:45:55 -08:00
Nicolas Le Goff
4cef82083c Add ACL Manipulator 2013-11-08 17:51:14 +01:00
Nicolas Le Goff
5c9427ae3b Add user notification throught user manipulator 2013-11-05 15:36:39 +01:00
Romain Neutron
13dd86c67f Fix CS 2013-10-31 14:22:41 +01:00
Romain Neutron
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
053de5df8b Address PR comments 2013-10-29 18:46:36 +01:00
Romain Neutron
280281f872 Update task manipulator, inject notifier 2013-10-29 18:46:35 +01:00
Romain Neutron
073a07fe7b add empty collection create method 2013-10-29 18:42:47 +01:00
Romain Neutron
fafc7c334c Use Job Id instead of classname in DB 2013-10-29 18:42:46 +01:00
Romain Neutron
0827ba514c Add task manipulator 2013-10-29 18:41:43 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Nicolas Le Goff
b45bc31135 Adress comments 2013-10-28 15:53:00 +01:00
Nicolas Le Goff
9737a758d6 Remove user adapter interface 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
297f23dc06 Addressed romainneutron comments 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
1f03451bfc Add user manager & user manipulator 2013-10-28 12:57:04 +01:00