Nicolas Le Goff
|
178da6a3a6
|
Fix tests
|
2014-03-24 12:29:38 +01:00 |
|
Nicolas Le Goff
|
63b6de5fc8
|
Remove one to one relation beetween account and token & add lastUsed field for token
|
2014-03-24 12:29:37 +01:00 |
|
Nicolas Le Goff
|
0cd4bb6e6a
|
Fix DQL
|
2014-03-24 12:28:19 +01:00 |
|
Nicolas Le Goff
|
0591976fe7
|
Fix missing namespace
|
2014-03-24 12:28:19 +01:00 |
|
Nicolas Le Goff
|
b75d331a05
|
Add findByUserAndApplication method
|
2014-03-24 12:28:16 +01:00 |
|
Nicolas Le Goff
|
a11aa87d0a
|
Return null if application is not found instead of throwing an exception
|
2014-03-24 12:28:16 +01:00 |
|
Nicolas Le Goff
|
c065340046
|
Add ApiOauthRefreshToken Repository
|
2014-03-24 12:28:15 +01:00 |
|
Nicolas Le Goff
|
d6a5a79229
|
Add some OauthCode repository functions
|
2014-03-24 12:28:15 +01:00 |
|
Nicolas Le Goff
|
bbbc8f7e02
|
Add some application repository function
|
2014-03-24 12:28:15 +01:00 |
|
Nicolas Le Goff
|
5d3cba6ce5
|
Add oauth repositories
|
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 |
|
Romain Neutron
|
b271c4ed9a
|
Add missing proxy and repository
|
2014-03-01 14:46:22 +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
|
256a68dc76
|
Merge pull request #992 from nlegoff/fix-repo
[3.9] Fix some issues in repos
|
2014-02-28 00:31:45 +01:00 |
|
Nicolas Le Goff
|
d0f8250509
|
Fix Typo in UserNotificationSettingRepository class name
|
2014-02-27 19:10:44 +01:00 |
|
Nicolas Le Goff
|
29c8624155
|
Fix usersetting repo
|
2014-02-27 19:10:25 +01:00 |
|
Romain Neutron
|
9a2875f46b
|
Fix registration table name
|
2014-02-27 16:57:31 +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
|
52f3baac05
|
Fix neutron's comment
|
2014-02-26 12:06:34 +01:00 |
|
Nicolas Le Goff
|
75fac19e73
|
Migrate demand table to doctrine entity && refactor registration API
|
2014-02-26 12:06:34 +01:00 |
|
Romain Neutron
|
4c29ea5a7a
|
Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users
Conflicts:
lib/classes/ACL.php
lib/classes/User/Adapter.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/orderdeliver.php
lib/classes/eventsmanager/notify/ordernotdelivered.php
lib/classes/eventsmanager/notify/push.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/validate.php
lib/classes/eventsmanager/notify/validationdone.php
lib/classes/eventsmanager/notify/validationreminder.php
lib/classes/module/report/add.php
lib/classes/module/report/edit.php
lib/classes/module/report/push.php
lib/classes/module/report/sent.php
lib/classes/module/report/validate.php
lib/classes/record/preview.php
|
2014-02-20 18:02:27 +01:00 |
|
Romain Neutron
|
e20c915775
|
Avoid using getPartialReference
|
2014-02-20 16:14:01 +01:00 |
|
Romain Neutron
|
12f9575a8b
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
lib/classes/API/OAuth2/Adapter.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Collection.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/User/Adapter.php
lib/classes/base.php
lib/classes/connection.php
lib/classes/databox/cgu.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/bridgeuploadfail.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/orderdeliver.php
lib/classes/eventsmanager/notify/ordernotdelivered.php
lib/classes/eventsmanager/notify/push.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/validate.php
lib/classes/eventsmanager/notify/validationdone.php
lib/classes/eventsmanager/notify/validationreminder.php
lib/classes/module/console/taskState.php
lib/classes/module/console/taskrun.php
lib/classes/record/adapter.php
lib/classes/registry.php
lib/classes/set/order.php
lib/classes/task/abstract.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/archive.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
templates/web/prod/upload/lazaret.html.twig
|
2014-02-20 16:05:23 +01:00 |
|
Romain Neutron
|
25073721c8
|
Fix unit tests
|
2014-02-20 13:08:56 +01:00 |
|
Nicolas Le Goff
|
ba464ad497
|
Fix CS
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
7fb44d2b43
|
Fix merge
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
eaa1feb765
|
Address PR comments
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
7c0d1e3d8d
|
Fix user migration
|
2014-02-19 17:29:26 +01:00 |
|
Nicolas Le Goff
|
c10c78f740
|
Fix unit tests
|
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
|
b341495c88
|
Fix tests
|
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
|
53ae0ccc24
|
Remove User_Adapter Inteface References
|
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
|
e233e5afa6
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/classes/Exception/Feed/ItemNotFound.php
lib/classes/Exception/Feed/PublisherNotFound.php
lib/classes/Feed/Abstract.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/CollectionInterface.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Collection.php
lib/classes/Feed/Entry/Interface.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Entry/ItemInterface.php
lib/classes/Feed/Interface.php
lib/classes/Feed/Link.php
lib/classes/Feed/LinkInterface.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/Feed/Publisher/Interface.php
lib/classes/Feed/Token.php
lib/classes/Feed/TokenAggregate.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Atom.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/Feed/XML/Interface.php
lib/classes/Feed/XML/RSS.php
lib/classes/Feed/XML/RSS/ImageInterface.php
lib/classes/http/request.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskState.php
lib/classes/module/console/tasklist.php
lib/classes/module/console/taskrun.php
lib/classes/registry.php
lib/classes/registryInterface.php
lib/classes/set/order.php
lib/classes/system/url.php
lib/classes/task/Scheduler.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/emptyColl.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/test.php
lib/classes/task/period/writemeta.php
lib/conf.d/PhraseaFixture/AbstractWZ.php
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
|
2014-01-06 15:38:14 +01:00 |
|
Romain Neutron
|
1e3b3a1b60
|
Fix latest merges
|
2013-12-09 19:19:53 +01:00 |
|
Romain Neutron
|
04a6bb1486
|
Fix latest merge, add missing repository method
|
2013-12-04 12:48:33 +01:00 |
|
Romain Neutron
|
766773da01
|
Fix CS
|
2013-12-03 21:20:19 +01:00 |
|
Romain Neutron
|
420df7febd
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Command/CreateCollection.php
lib/Alchemy/Phrasea/Controller/Admin/Databox.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
lib/conf.d/Doctrine/Entities.Session.dcm.yml
lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
|
2013-12-03 21:19:20 +01:00 |
|
Romain Neutron
|
2ba164701d
|
Use symfony translator
|
2013-12-03 20:02:40 +01:00 |
|
Romain Neutron
|
6ab51d55f8
|
Add missing headers
|
2013-11-20 19:03:55 +01:00 |
|
Romain Neutron
|
051d9f4035
|
Remove license comments
|
2013-11-20 16:49:29 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|