hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 02:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,479 Commits 268 Branches 107 Tags
8f87e8b1c88c4dcc61d40b9eca967fcad95c8808
Commit Graph

229 Commits

Author SHA1 Message Date
Romain Neutron
8f87e8b1c8 Add user repository as a service 2014-02-28 19:58:12 +01:00
Romain Neutron
08efd8ff72 Cleanup API 2014-02-28 00:38:12 +01:00
Romain Neutron
a0fc4b2360 Fix CS 2014-02-26 12:44:32 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00
Nicolas Le Goff
4535491e6c Merge pull request #965 from romainneutron/host-configuration 
[3.9] Add configuration per host
 2014-02-24 12:30:26 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
862fe696cb Remove some circular references 2014-02-20 20:09:14 +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
134717343a Fix latest merge 2014-02-20 16:06:51 +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
Romain Neutron
2af21c064c Avoid errors by explicitely namespacing root exception 2014-02-20 11:28:31 +01:00
Nicolas Le Goff
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +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
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
Nicolas Le Goff
383ff77449 Merge branch '3.8' 
Conflicts:
	.travis.yml
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/databox.php
 2014-01-27 17:23:03 +01:00
Nicolas Le Goff
a960150caa Fix #1670 API password grant type authentication is broken 2014-01-22 15:56:57 +01:00
Romain Neutron
799e3620a3 Merge branch '3.8' 
Conflicts:
	lib/classes/API/V1/adapter.php
 2014-01-07 17:37:06 +01:00
Romain Neutron
d7b4e61c10 Make search engine a real service 2014-01-07 16:45:58 +01:00
Romain Neutron
7e77965be9 Fix #1647 : Cleanup SE cache after API query 2014-01-07 10:22:53 +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
d519c13e56 Bump copyright year 2014-01-06 15:28:12 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
c3df531f59 Move main "languages" and "servername" to top level, "task-manager" and "binaries" to main configuration 2013-12-20 11:43:41 +01:00
Romain Neutron
6c45e8d40a Add improvements to unit tests 2013-12-20 10:51:35 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +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
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
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
3548421160 Add basket converter 2013-11-13 17:52:12 +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
13dd86c67f Fix CS 2013-10-31 14:22:41 +01:00
Romain Neutron
ea7523f1db Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/record/adapter.php
	lib/classes/task/Scheduler.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 14:01:44 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +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
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
b7d8f777fd Merge pull request #694 from romainneutron/fix-1535 
[3.8] Fix #1535 : API does not display search engine suggestions correctly
 2013-10-15 04:05:30 -07:00