hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,382 Commits 268 Branches 107 Tags
df56eb4da7f5480c4e35b10c7528973a362dafa3
Commit Graph

302 Commits

Author SHA1 Message Date
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
3b0fe2eb75 Fix CS 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
5635553f71 Fix neutron's comments 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
0e1203f595 Some fix after rebase 2014-02-19 17:28:54 +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
Nicolas Le Goff
2aba3e8d8d Merge pull request #957 from romainneutron/doctrine-namespace 
[3.9] Add a namespace to Phraseanet doctrine entities
 2014-02-19 11:37:09 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Romain Neutron
372fc86601 Use short array declarations 2014-02-11 18:44:31 +01:00
Romain Neutron
e4ce070cde Fix latest merge 2014-02-11 15:26:51 +01:00
Nicolas Le Goff
6053a03b87 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-02-11 09:02:29 +01:00
Romain Neutron
66b3ad0022 Fix #1691 : Avoid exception message for users 2014-02-10 23:33:25 +01:00
Nicolas Le Goff
c4eadb7e0e Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
 2014-02-05 19:42:22 +01:00
Nicolas Le Goff
863975d7ca Merge pull request #925 from romainneutron/avoid-exception-driven-logic 
[3.8] Avoid exception driven logic
 2014-02-05 19:30:11 +01:00
Romain Neutron
b9e4c599b2 Avoid exception driven logic 2014-02-05 16:43:49 +01:00
Romain Neutron
a2e7918b63 Update geonames server dependency for better logs 2014-02-05 16:41:15 +01:00
Romain Neutron
3945be00d4 Fix CS 2014-01-30 19:56:05 +01:00
Nicolas Le Goff
0af2d9ef84 Remove possibility to update phraseanet from admin panel 2014-01-27 19:50:33 +01:00
Nicolas Le Goff
6ba5ce6669 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig
 2014-01-24 18:52:14 +01:00
Nicolas Le Goff
18708c46b2 Fix #1667 Admin tree is not reloaded when empty action is triggered 2014-01-22 12:06:17 +01:00
Nicolas Le Goff
45679d8675 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/classes/collection.php
	templates/web/admin/databox/databox.html.twig
 2014-01-14 12:38:58 +01:00
Romain Neutron
f0486f9478 Fix #1646 : Unable to mount collections 2014-01-13 18:06:18 +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
05b360ed0f Fix array declaration 2013-12-20 10:43:04 +01:00
Romain Neutron
ecf516406a Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php
 2013-12-19 10:31:52 +01:00
Nicolas Le Goff
3f54fb3f20 Fix #1630 : Fix user registration management 2013-12-18 20:00:09 +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
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
b024492c07 Merge pull request #819 from romainneutron/fix-1591 
Fix #1591 : Fix subdef group/name parameter extraction
 2013-12-03 09:09:19 -08:00
Romain Neutron
fd83ba07cb Fix #1591 : Fix subdef group/name parameter extraction 2013-12-02 17:47:50 +01:00
Romain Neutron
1472f96e93 Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine 2013-11-28 16:16:18 +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
10b28bc2ed Fix #1568 : Scheduler timeouts 2013-11-20 12:48:18 +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
d40b1d4fb1 Fix CS 2013-11-18 13:07:40 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
3e9f3418ce Remove dead code 2013-11-13 14:54:47 +01:00