Commit Graph

2324 Commits

Author SHA1 Message Date
Nicolas Le Goff
973d7f68a2 Fix subdef path indexing 2015-03-12 20:10:13 +01:00
Nicolas Le Goff
7596ddc5d2 Fix tests 2015-03-12 17:13:53 +01:00
Nicolas Le Goff
c5a94e6eed Merge pull request #1267 from bburnichon/feature/insight-fixes
[WIP] Insight fixes
2015-03-12 17:13:12 +01:00
Nicolas Le Goff
0da5d16aeb Merge pull request #1294 from mdarse/candidates-empty
Handle case when cterms XML doesn't exist yet
2015-03-12 17:12:39 +01:00
Mathieu Darse
fc3c81f350 Handle case when cterms XML doesn't exist yet 2015-03-12 16:41:25 +01:00
Benoît Burnichon
7d7e8983c9 Change raw SQL into builder use 2015-03-12 15:08:26 +01:00
Benoît Burnichon
a8c5166ed2 Missing app remove in databox_status 2015-03-12 15:08:26 +01:00
Benoît Burnichon
43bc4dd9bb More SQL Injection prevention. 2015-03-12 15:08:26 +01:00
Benoît Burnichon
135b2fcaff Remove now useless dependency 2015-03-12 15:08:25 +01:00
Benoît Burnichon
541d8a1d27 Fixup error in binary operations. 2015-03-12 15:08:25 +01:00
Benoît Burnichon
66f0379c00 Properly use doctrine DBAL notIn statement 2015-03-12 15:08:25 +01:00
Benoît Burnichon
d9b7c599d4 Always work on 32bits statuses. use base_convert i/o hex2bin 2015-03-12 15:08:25 +01:00
Benoît Burnichon
d2c5ecf620 cleanup some methods in databox_status as only 32bit ints used. 2015-03-12 15:08:25 +01:00
Benoît Burnichon
3205d0e1b6 Fix databox for SQL injections. 2015-03-12 15:08:25 +01:00
Benoît Burnichon
40b894367a Fix caption_field class
Possible SQL injection
Proper looping when renaming big bunch of metadata.

/!\ Big refactoring in progress
2015-03-12 15:08:25 +01:00
Benoît Burnichon
82815e0fb5 Possible SQL injection in base box class 2015-03-12 15:08:24 +01:00
Benoît Burnichon
fbfaeba5fe Use proper DBAL connection call with parameter. 2015-03-12 15:08:24 +01:00
Benoît Burnichon
e84061924b Refactor MailChecker to avoid static instance. 2015-03-12 15:08:24 +01:00
Benoît Burnichon
84ef2f438f Refactor base, appbox & databox instanciation process 2015-03-12 15:08:24 +01:00
Nicolas Le Goff
24036bf4ed Fix some tests 2015-03-11 21:50:36 +01:00
Benoît Burnichon
3dfed100ea Double binary to decimal conversion 2015-03-11 17:48:14 +01:00
Benoît Burnichon
089674bc26 replace loop by str_pad 2015-03-11 17:47:40 +01:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22:20 +01:00
Mathieu Darse
63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer
Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js
2015-03-10 15:25:20 +01:00
Nicolas Le Goff
95243763f2 Fix thesaurus candidate terms xml creation 2015-03-10 14:36:38 +01:00
Nicolas Le Goff
ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
2015-03-10 14:36:31 +01:00
Nicolas Le Goff
42a21e8e7d Merge pull request #1277 from nlegoff/locale39
[3.9] Fix locales extraction
2015-03-10 11:56:29 +01:00
Nicolas Le Goff
4999173467 Merge pull request #1273 from nlegoff/remove-ws
[3.9] Remove Websockets dependencies
2015-03-10 11:05:47 +01:00
Nicolas Le Goff
9ee42e44fe Fix locales extraction 2015-03-10 10:26:06 +01:00
Nicolas Le Goff
bd4836aaa7 Remove Websockets dependencies 2015-03-10 09:55:43 +01:00
Nicolas Le Goff
5a55732b46 Fix strict mode sql issue 2015-03-06 12:35:18 +01:00
Nicolas Le Goff
4f66588600 Add dynamic facets query 2015-02-26 12:28:22 +01:00
Nicolas Le Goff
e01c73aa83 Fix typo 2015-02-24 15:27:56 +01:00
Nicolas Le Goff
5b3e699599 Merge remote-tracking branch 'upstream/3.8'
Conflicts:
	bower.json
	composer.lock
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/User/Query.php
	lib/classes/patch/320alpha4b.php
	templates/web/admin/statusbit.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/lazaret.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	www/scripts/apps/login/home/config.js
	www/skins/prod/000000/prodcolor.css
	www/skins/prod/959595/prodcolor.css
2015-02-23 19:16:56 +01:00
Nicolas Le Goff
f06cb7eaec Merge pull request #1253 from kwemi/design-update-v1
Design update
2015-02-23 11:42:27 +01:00
Olivier Mayer
a49acb03e4 Design update 2015-02-23 15:15:55 +09:00
Nicolas Le Goff
2b96a0b238 Revert downloadble subdef api expositioon 2015-02-20 18:44:19 +01:00
Nicolas Le Goff
50165bd894 Fix record preview in production 2015-02-20 17:25:50 +01:00
Nicolas Le Goff
111755fa9b Refactor status display 2015-02-19 15:14:23 +01:00
Mathieu Darse
57f3e3dcf0 Shorten remaining flag constants and remove legacy ones 2015-02-18 19:04:10 +01:00
Jean-Yves Gaulier
41cd9c3f17 #PHRAS-325
add parameter "adapt" to route "/embed/substitute"
fix : substituted was indicated only for thumbnails on prod/tools/recreate
2015-02-18 18:12:11 +01:00
Nicolas Le Goff
a3ef1b606c Makes static thumbnails delivery as default delivery && set symlink dir in www directory 2015-02-16 15:01:44 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
37c667113f Fix feeds migration & disable email transport 2015-02-12 17:35:13 +01:00
Mathieu Darse
aeb5b20215 Fix some dispatch calls 2015-02-09 19:26:22 +01:00
Nicolas Le Goff
065f64bd47 Report previous patches 2015-02-09 13:42:26 +01:00
Nicolas Le Goff
60d228e52a Remove unecessary patch 2015-02-05 19:16:24 +01:00
Nicolas Le Goff
56a95f724a Remove check innoDB 2015-02-05 19:03:49 +01:00
Nicolas Le Goff
949bf06cac Merge branch '3.8'
Conflicts:
	CHANGELOG.md
	bin/console
	bin/developer
	bin/setup
	bower.json
	composer.json
	composer.lock
	features/bootstrap/FeatureContext.php
	features/bootstrap/GuiContext.php
	lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php
	lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Admin/Collection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Client/Baskets.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Prod/Property.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Prod/Tools.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/User/Edit.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/Doctrine/Entities/AuthFailure.php
	lib/Doctrine/Entities/Basket.php
	lib/Doctrine/Entities/BasketElement.php
	lib/Doctrine/Entities/LazaretAttribute.php
	lib/Doctrine/Entities/LazaretCheck.php
	lib/Doctrine/Entities/LazaretFile.php
	lib/Doctrine/Entities/LazaretSession.php
	lib/Doctrine/Entities/Session.php
	lib/Doctrine/Entities/SessionModule.php
	lib/Doctrine/Entities/StoryWZ.php
	lib/Doctrine/Entities/UsrList.php
	lib/Doctrine/Entities/UsrListEntry.php
	lib/Doctrine/Entities/UsrListOwner.php
	lib/Doctrine/Entities/ValidationData.php
	lib/Doctrine/Entities/ValidationParticipant.php
	lib/Doctrine/Entities/ValidationSession.php
	lib/Doctrine/Logger/MonologSQLLogger.php
	lib/Doctrine/Repositories/BasketRepository.php
	lib/Doctrine/Repositories/ValidationParticipantRepository.php
	lib/Doctrine/Types/Binary.php
	lib/Doctrine/Types/Blob.php
	lib/Doctrine/Types/Enum.php
	lib/Doctrine/Types/LongBlob.php
	lib/Doctrine/Types/VarBinary.php
	lib/classes/API/OAuth2/Account.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/OAuth2/Application/OfficePlugin.php
	lib/classes/API/OAuth2/AuthCode.php
	lib/classes/API/OAuth2/RefreshToken.php
	lib/classes/API/OAuth2/Token.php
	lib/classes/API/V1/Abstract.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/exception/abstract.php
	lib/classes/API/V1/exception/badrequest.php
	lib/classes/API/V1/exception/forbidden.php
	lib/classes/API/V1/exception/internalservererror.php
	lib/classes/API/V1/exception/maintenance.php
	lib/classes/API/V1/exception/methodnotallowed.php
	lib/classes/API/V1/exception/notfound.php
	lib/classes/API/V1/exception/unauthorized.php
	lib/classes/API/V1/result.php
	lib/classes/Exception/Feed/EntryNotFound.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/CollectionInterface.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/Image.php
	lib/classes/Feed/XML/RSS/ImageInterface.php
	lib/classes/User/Adapter.php
	lib/classes/User/Interface.php
	lib/classes/appbox/register.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/deprecated/countries.php
	lib/classes/deprecated/inscript.api.php
	lib/classes/eventsmanager/event/test.php
	lib/classes/ftpclient.php
	lib/classes/http/request.php
	lib/classes/media/subdef.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/patch/320alpha4b.php
	lib/classes/patch/3715alpha1a.php
	lib/classes/patch/379alpha1a.php
	lib/classes/patch/380alpha10a.php
	lib/classes/patch/380alpha11a.php
	lib/classes/patch/380alpha13a.php
	lib/classes/patch/380alpha14a.php
	lib/classes/patch/380alpha15a.php
	lib/classes/patch/380alpha16a.php
	lib/classes/patch/380alpha17a.php
	lib/classes/patch/380alpha18a.php
	lib/classes/patch/380alpha3a.php
	lib/classes/patch/380alpha4a.php
	lib/classes/patch/380alpha6a.php
	lib/classes/patch/380alpha8a.php
	lib/classes/patch/380alpha9a.php
	lib/classes/patch/381alpha1b.php
	lib/classes/patch/381alpha2a.php
	lib/classes/patch/381alpha3a.php
	lib/classes/patch/381alpha4a.php
	lib/classes/patch/383alpha1a.php
	lib/classes/patch/383alpha2a.php
	lib/classes/patch/383alpha3a.php
	lib/classes/patch/383alpha4a.php
	lib/classes/record/adapter.php
	lib/classes/record/preview.php
	lib/classes/recordutils.php
	lib/classes/recordutils/audio.php
	lib/classes/recordutils/document.php
	lib/classes/recordutils/map.php
	lib/classes/recordutils/video.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/apiwebhooks.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
	templates/web/admin/collection/collection.html.twig
	templates/web/common/dialog_export.html.twig
	templates/web/common/menubar.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	templates/web/prod/upload/upload.html.twig
	templates/web/report/report_layout_child.html.twig
	templates/web/setup/step2.html.twig
	templates/web/thesaurus/new-synonym-dialog.html.twig
	templates/web/thesaurus/properties.html.twig
	templates/web/thesaurus/search.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
2015-02-05 18:38:49 +01:00
Nicolas Le Goff
e9fb3d44fc Merge pull request #1225 from jygaulier/PHRAS-325
#PHRAS-325
2015-02-05 16:22:46 +01:00