Benoît Burnichon
|
135b2fcaff
|
Remove now useless dependency
|
2015-03-12 15:08:25 +01:00 |
|
Nicolas Le Goff
|
24036bf4ed
|
Fix some tests
|
2015-03-11 21:50:36 +01:00 |
|
Nicolas Le Goff
|
b536c7ae59
|
Remove unused function
|
2015-03-11 21:50:36 +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
|
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
|
3f6bb70b57
|
Fix #1271 Can not add user trough validation process
|
2015-03-09 20:35:09 +01:00 |
|
Benoît Burnichon
|
c7fb23d28c
|
Properly Retrieve LazaretFile repo. Update LazaretTests
|
2015-03-04 19:33:20 +01:00 |
|
Nicolas Le Goff
|
709af5bba0
|
Optim
|
2015-02-27 16:09:10 +01:00 |
|
Nicolas Le Goff
|
4376ccb230
|
Fix record preview
|
2015-02-24 15:28:14 +01:00 |
|
Nicolas Le Goff
|
aac3c5de5c
|
Merge pull request #1258 from kwemi/design-update-v1
980px layout
|
2015-02-24 11:53:42 +01:00 |
|
Olivier Mayer
|
e028b4c7d5
|
980px layout
|
2015-02-24 18:18:31 +09: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
|
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 |
|
Nicolas Le Goff
|
c6bab1182d
|
Merge pull request #1250 from kwemi/design-update-v1
Design update v1
|
2015-02-19 10:54:18 +01:00 |
|
Olivier Mayer
|
1f2d79355f
|
Result number
fix #4
|
2015-02-19 18:29:45 +09:00 |
|
Jean-Yves Gaulier
|
76e046e111
|
#PHRAS-370 #time 2h
faster empty
|
2015-02-17 19:34:11 +01:00 |
|
Nicolas Le Goff
|
9a3e92ed9c
|
Multiple ORMs for all database
|
2015-02-12 17:58:45 +01:00 |
|
Nicolas Le Goff
|
4cd2ef9a6d
|
Merge pull request #1235 from nlegoff/sprint387
[3.8] some fixes
|
2015-02-11 19:49:03 +01:00 |
|
Nicolas Le Goff
|
4c9feeffc7
|
Merge pull request #1234 from jygaulier/PHRAS-370
fix #PHRAS-370
|
2015-02-11 19:48:45 +01:00 |
|
Nicolas Le Goff
|
04b77fd7aa
|
PHRAS-405 #fix
|
2015-02-11 18:25:19 +01:00 |
|
Jean-Yves Gaulier
|
706b77ea84
|
fix #PHRAS-370
now empty 10 by 10
|
2015-02-11 18:15:24 +01:00 |
|
Nicolas Le Goff
|
aae2d564e9
|
Fix upload display
|
2015-02-06 16:08:34 +01:00 |
|
Nicolas Le Goff
|
5bf47e9c42
|
Fix controller call function
|
2015-02-05 19:00:36 +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
|
6b445648da
|
Merge pull request #1228 from jygaulier/PHRAS-382
#PHRAS-382 #time 3h
|
2015-02-05 16:10:29 +01:00 |
|
Jean-Yves Gaulier
|
f71f7adf19
|
hide "use flash uploader" with ie >= 10
#time 8h
|
2015-02-05 14:20:44 +01:00 |
|
Mathieu Darse
|
a0dad0e96e
|
WIP on reindexing events handling
|
2015-02-04 19:53:35 +01:00 |
|
Jean-Yves Gaulier
|
7185b031fb
|
#PHRAS-382 #time 3h
|
2015-02-03 15:52:39 +01:00 |
|
Mathieu Darse
|
c6b509a32c
|
Centralize record event dispatches inside record adapter (but not structure ones)
|
2015-02-03 11:19:23 +01:00 |
|
Jean-Yves Gaulier
|
b149483d28
|
#PHRAS-223 #time 6h
|
2015-01-28 18:44:18 +01:00 |
|
Mathieu Darse
|
e287ba1a42
|
Merge record and structure events inside new namespace
|
2015-01-27 18:59:27 +01:00 |
|
Mathieu Darse
|
bc61536a41
|
Story record emits proper record events
|
2015-01-27 16:49:23 +01:00 |
|
Mathieu Darse
|
a1d6fc03b6
|
Move RECORD_* events in a new RecordEvents class
|
2015-01-27 16:17:48 +01:00 |
|
Mathieu Darse
|
85c410278a
|
Remaining record events OK
|
2015-01-27 14:58:05 +01:00 |
|
Mathieu Darse
|
a64b8286e6
|
Record/story metadata and collection change events OK
|
2015-01-26 20:06:09 +01:00 |
|
Mathieu Darse
|
47d00db5ab
|
Story create/delete events OK
|
2015-01-26 19:05:03 +01:00 |
|
Mathieu Darse
|
b0959a9a31
|
Record create/delete events OK
|
2015-01-26 17:41:05 +01:00 |
|
Nicolas Le Goff
|
a01bf29c5b
|
Add elasticsearch reindex events
|
2015-01-26 16:04:23 +01:00 |
|
Nicolas Le Goff
|
5fe09febb7
|
Merge pull request #1209 from nlegoff/patch-387
[3.8.7] Fix some easy pick
|
2015-01-21 17:19:02 +01:00 |
|
Nicolas Le Goff
|
10c3869ca3
|
PHRAS-374 Add command to rebuild subdefs
|
2015-01-21 16:14:45 +01:00 |
|
Nicolas Le Goff
|
5ceb6a8645
|
PHRAS-372 Allow user to change mime type of a record
|
2015-01-21 16:14:45 +01:00 |
|
Nicolas Le Goff
|
d82adbf109
|
Bump year to 2015
|
2015-01-20 14:08:25 +01:00 |
|
Nicolas Le Goff
|
5e33fdafe4
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/classes/caption/field.php
lib/classes/module/report/activity.php
lib/classes/module/report/download.php
lib/classes/task/period/apibridge.php
|
2014-12-16 13:07:25 +01:00 |
|
Nicolas Le Goff
|
2b243a041b
|
Fix date edit for record
|
2014-12-10 18:54:29 +01:00 |
|
Nicolas Le Goff
|
589169299c
|
Fix merge 3.8
|
2014-12-09 14:01:00 +01:00 |
|
Nicolas Le Goff
|
9f38823f27
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Prod/Story.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/User/Adapter.php
lib/classes/databox.php
lib/classes/media/subdef.php
lib/classes/module/report.php
lib/classes/module/report/activity.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/module/report/nav.php
lib/classes/module/report/question.php
lib/classes/module/report/sqlaction.php
lib/classes/module/report/sqlconnexion.php
lib/classes/module/report/sqldownload.php
lib/classes/module/report/sqlfilter.php
lib/classes/task/abstract.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/prod/index.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/report/activityTest.php
tests/classes/report/editTest.php
|
2014-12-09 13:59:29 +01:00 |
|
Nicolas Le Goff
|
9733f9d6a5
|
PHRAS-349 #fix edition date for stories
|
2014-12-04 15:29:31 +01:00 |
|
Nicolas Le Goff
|
e9c6d1a56e
|
Fix mess in prod (record & feed) templates
|
2014-12-04 11:48:11 +01:00 |
|
Nicolas Le Goff
|
68af5b3391
|
Returns 304 http code if images are not modified
|
2014-11-21 10:36:52 +01:00 |
|