hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 11:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,059 Commits 268 Branches 107 Tags
d7b4e61c101dc833ff45db8215fdc3d26c3637e1
Commit Graph

205 Commits

Author SHA1 Message Date
Romain Neutron
d7b4e61c10 Make search engine a real service 2014-01-07 16:45:58 +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
Romain Neutron
eb6eb689e0 Fix #1535 : API does not display search engine suggestions correctly 2013-10-10 18:00:09 +02:00
Romain Neutron
e87aa5afb3 Fix #1524 : API search query is discarded with GET method 2013-10-10 13:39:59 +02:00
Romain Neutron
d716e91169 Merge branch '3.8' 
Conflicts:
	composer.lock
 2013-10-04 15:15:04 +02:00
Nicolas Le Goff
9fc8fbc194 Fix API password grant type authentication 2013-10-03 17:12:46 +02:00
Romain Neutron
1b9a90d635 Fix office plugin class name 2013-10-03 15:24:15 +02:00
Romain Neutron
d294e553d8 Fix office plugin class name 2013-09-30 18:25:41 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
b96c7e8622 Remove chrome frame toggler 2013-09-23 14:11:58 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
391d84ca56 Fix merge 2013-09-17 16:15:44 +02:00
Romain Neutron
e8bf678fc2 Cleanup CS 2013-09-14 02:10:11 +02:00
Romain Neutron
6c7c196a20 Add Office Plugin client id and secret 2013-09-14 02:10:11 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
Romain Neutron
3649d89b81 Cleanup CS 2013-09-09 13:31:31 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Andrey
2773075c52 Fixed another typo in adapter 2013-09-05 13:44:12 +02:00
Andrey
1baf81040f Fixed a typo 2013-09-05 13:44:12 +02:00
Andrey
a5cdb65ed6 Removed loadwithuser method 2013-09-05 13:44:12 +02:00
Andrey
c8b62c02db Rebased, fixed codestyle 2013-09-05 13:44:06 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Nicolas Le Goff
75d767333c Move engine query log process from search engine classes to controllers 2013-08-25 13:55:04 +02:00
Nicolas Le Goff
5b0bc8b284 Add recess binary 
Set recess binary to config
 2013-07-12 20:06:32 +02:00
Romain Neutron
242b2c0f71 Remove dependency on convert and composite 2013-07-04 14:10:57 +02:00