hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,425 Commits 268 Branches 107 Tags
2ec4ffdbcc6e9f7708082f80133db05695de8938
Commit Graph

87 Commits

Author SHA1 Message Date
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
c98fe4c23d Adressed Neutron's comments 2014-02-26 12:06:34 +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
25073721c8 Fix unit tests 2014-02-20 13:08:56 +01:00
Nicolas Le Goff
7fb44d2b43 Fix merge 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
7ac2358edd Fix latest master rebase 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
b341495c88 Fix tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
53ae0ccc24 Remove User_Adapter Inteface References 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
3322437648 Replace setters 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
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +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
Romain Neutron
b9e4c599b2 Avoid exception driven logic 2014-02-05 16:43:49 +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
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
432252f5f8 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig
 2013-11-12 19:19:13 +01:00
Romain Neutron
a2899f6934 Insight recommendations 2013-11-12 17:58:03 +01:00
Romain Neutron
bea211074b Fix #1571 : Cleanup user settings, fix user settings calls 2013-11-12 15:16:54 +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
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Nicolas Le Goff
41bbd13f7d Fix #1432 User settings for notifications are not saved in 2013-09-03 18:03:43 +02:00
Nicolas Le Goff
ac5a929b3f Update SQLite database reference 2013-08-23 15:36:02 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
a6a9a93b05 remove call to app in templates 2013-07-12 20:09:51 +02:00
Romain Neutron
4720a46b66 Update geoname server service provider 2013-07-02 15:04:33 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Nicolas Le Goff
f30bca91a9 Adressed PR comment's 
Fix tests

Add dot at end of senetences

Fix typo
 2013-06-13 14:05:33 +02:00
Nicolas Le Goff
325d54006a Fix AccountForm validation & Add repeated form 2013-06-13 14:05:09 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
a000c240cc Add updated Account and Login controllers 2013-05-29 14:23:19 +02:00
Romain Neutron
f6e1f95669 Fix account tests 2013-05-29 14:23:18 +02:00
Romain Neutron
b8b0cec39c Add old password to password renewal form 2013-05-29 14:23:12 +02:00
Romain Neutron
a523261a73 Update authentication 2013-05-29 14:22:51 +02:00
Romain Neutron
cf0f13d9c9 Add TokensServiceProvider 2013-04-30 18:44:35 +02:00
Romain Neutron
74ce48fe45 Fix unit tests 2013-01-29 19:35:51 +01:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +01:00
Romain Neutron
309a0a9472 Add better exception handling for emails 2013-01-29 11:32:43 +01:00
Romain Neutron
303c7e859a Remove unnecessary try catch blocks 2013-01-29 11:12:54 +01:00
Romain Neutron
aa18c48306 Fix unit tests 2013-01-29 09:34:20 +01:00