Nicolas Le Goff
32b6423cbe
Use cached file annotation reader
2015-02-09 12:48:28 +01:00
Nicolas Le Goff
d249b5a898
Fix travis.yml
2015-02-09 12:47:56 +01:00
Nicolas Le Goff
950cdbe5d9
Fix tests
2015-02-08 15:15:51 +01:00
Nicolas Le Goff
40da069bf3
Fix tests
2015-02-06 20:03:33 +01:00
Nicolas Le Goff
5021d28b0b
Fix tests
2015-02-06 19:54:58 +01:00
Nicolas Le Goff
bc6b1f593e
Fix tests
2015-02-06 19:47:00 +01:00
Nicolas Le Goff
be34fa8877
Fix minify config
2015-02-06 19:33:17 +01:00
Nicolas Le Goff
a3f1eddefb
Fix tests
2015-02-06 19:30:26 +01:00
Nicolas Le Goff
700c955677
Fix tests
2015-02-06 19:25:19 +01:00
Nicolas Le Goff
0eedf67da8
Fix minify configuration
2015-02-06 19:16:15 +01:00
Nicolas Le Goff
4e5dca3720
Fix javascript issues
2015-02-06 19:14:21 +01:00
Nicolas Le Goff
b2dad6c18a
Fix SQL queries
2015-02-06 17:01:49 +01:00
Nicolas Le Goff
e23c35616c
Fix check path
2015-02-06 16:39:27 +01:00
Nicolas Le Goff
33fc12e09e
Remove strict comparison
2015-02-06 16:17:26 +01:00
Nicolas Le Goff
67423b9add
Fix thesaurus display
2015-02-06 16:16:54 +01:00
Nicolas Le Goff
cec55560a5
Fix status img size
2015-02-06 16:14:41 +01:00
Nicolas Le Goff
aae2d564e9
Fix upload display
2015-02-06 16:08:34 +01:00
Nicolas Le Goff
f385af1bbf
Fix search query
2015-02-06 16:06:41 +01:00
Nicolas Le Goff
5a62787b85
Fix geonames amd loading
2015-02-06 16:04:18 +01:00
Nicolas Le Goff
dc59f71a6f
Fix connected user tooltip
2015-02-06 14:27:46 +01:00
Nicolas Le Goff
555e8ce906
Fix tinymce path
2015-02-06 14:16:44 +01:00
Nicolas Le Goff
00d49cd74c
Fix autobahn js dependency
2015-02-06 14:16:44 +01:00
Nicolas Le Goff
57e2f0411f
Fix installation
2015-02-06 13:26:49 +01:00
Nicolas Le Goff
5ee9bbd33c
Fix trans tag in templates
2015-02-05 21:48:28 +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
5bf47e9c42
Fix controller call function
2015-02-05 19:00:36 +01:00
Nicolas Le Goff
5da553756c
Simpler deps
2015-02-05 18:56:24 +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
Jean-Yves Gaulier
2b3186266c
fix :
...
nosubdef --> no subdefs
nosubdef=1 --> no subdefs
nosubdef=0 --> subdefs
2015-02-05 16:19:30 +01:00
Nicolas Le Goff
6b445648da
Merge pull request #1228 from jygaulier/PHRAS-382
...
#PHRAS-382 #time 3h
2015-02-05 16:10:29 +01:00
Nicolas Le Goff
2ea3ba86d6
Merge pull request #1229 from jygaulier/UPDATE_MEDIA_ALCHEMYST_0.4.8
...
update media-alchemyst
2015-02-05 16:09:35 +01:00
Nicolas Le Goff
0837b4bcaa
Merge pull request #1230 from jygaulier/PHRAS-356
...
#PHRAS-356
2015-02-05 15:30:25 +01:00
Jean-Yves Gaulier
f71f7adf19
hide "use flash uploader" with ie >= 10
...
#time 8h
2015-02-05 14:20:44 +01:00
Jean-Yves Gaulier
ee52bce2bd
update media-alchemyst
2015-02-03 17:36:50 +01:00
Jean-Yves Gaulier
7185b031fb
#PHRAS-382 #time 3h
2015-02-03 15:52:39 +01:00
Jean-Yves Gaulier
e69d84b3d5
#PHRAS-325
...
fix typo : the new parameter is "nosubdefs" (with 's' at end)
2015-02-02 17:08:50 +01:00
Jean-Yves Gaulier
6449c58e17
#PHRAS-325 #time 3h
...
added parameter "nosubdef" to route "/api/v1/records/add"
nb : does NOT prevent creation of subdef if file passes thru the quarantine.
2015-02-02 17:04:54 +01:00
Nicolas Le Goff
21054d3849
Merge pull request #1227 from nlegoff/fix-memcached-typo
...
[3.8.7] Fix typo memcached
2015-02-02 14:18:55 +01:00
Nicolas Le Goff
cca0b145e7
Fix typo
2015-02-02 14:18:03 +01:00
Jean-Yves Gaulier
138008f7c6
#PHRAS-325 #time 5h
...
fix "substit" flag in subdef.
new api route /embed/substitute
parms :
- databox_id
- record_id
- name
- /file/
more properties returned by api / object "embed" :
- substituted
- created_on
- updated_on
2015-01-29 19:55:24 +01:00
Nicolas Le Goff
32416b79de
Merge pull request #1222 from jygaulier/PHRAS-223
...
#PHRAS-223
2015-01-29 13:29:31 +01:00
Nicolas Le Goff
cc953b5881
Merge pull request #1223 from jygaulier/PHRAS-276
...
#PHRAS-276 #time 45m
2015-01-29 13:29:09 +01:00
Jean-Yves Gaulier
5802659712
#PHRAS-276 #time 45m
2015-01-28 19:57:20 +01:00
Jean-Yves Gaulier
b149483d28
#PHRAS-223 #time 6h
2015-01-28 18:44:18 +01:00
Nicolas Le Goff
e0595fd8e0
Merge pull request #1221 from jygaulier/PHRAS-260
...
#PHRAS-260 #time 5m
2015-01-28 14:57:00 +01:00
Nicolas Le Goff
1ad8418476
Merge pull request #1219 from jygaulier/PHRAS-271
...
fix #PHRAS-343
2015-01-28 14:56:42 +01:00
Jean-Yves Gaulier
f38f87a7d2
#PHRAS-260 #time 5m
2015-01-28 14:25:36 +01:00
Nicolas Le Goff
0488091c4b
Merge pull request #1220 from jygaulier/PHRAS-359
...
fix #PHRAS-359
2015-01-28 14:21:57 +01:00
