Nicolas Le Goff
|
b393bbee3d
|
Merge pull request #1293 from nlegoff/390tests
[3.9] some fixes
|
2015-03-12 19:50:15 +01:00 |
|
Jean-Yves Gaulier
|
be4923166f
|
minor fix
|
2015-03-12 19:17:26 +01:00 |
|
Nicolas Le Goff
|
3397df2f36
|
Fix tests
|
2015-03-12 17:55:32 +01:00 |
|
Jean-Yves Gaulier
|
ff83ee8cb0
|
minor fix
|
2015-03-12 17:08:39 +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
|
42a21e8e7d
|
Merge pull request #1277 from nlegoff/locale39
[3.9] Fix locales extraction
|
2015-03-10 11:56:29 +01:00 |
|
Nicolas Le Goff
|
5ee0d46cfb
|
Merge pull request #1278 from kwemi/design-update-v1
Design update v1
|
2015-03-10 11:56:01 +01:00 |
|
Olivier Mayer
|
2df0a404ea
|
Menu trigger icon
|
2015-03-10 19:19:10 +09: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 |
|
Olivier Mayer
|
5117c1710f
|
Sidebar menu order + picto update
|
2015-03-10 17:55:07 +09:00 |
|
Olivier Mayer
|
d38cc9f6ae
|
Paginate (partial)
|
2015-03-10 17:55:07 +09:00 |
|
Nicolas Maillat
|
3ea2042bb8
|
Update thesaurus.js.twig
change for elasticsearch thesaurus search syntaxe.
|
2015-03-06 19:12:39 +01:00 |
|
Nicolas Maillat
|
f59369a770
|
Merge pull request #1269 from kwemi/design-update-v1
Change for Nico.
change positon of proposal.
|
2015-03-06 18:18:58 +01:00 |
|
Olivier Mayer
|
7e8e383dba
|
Change for Nico
|
2015-03-07 02:14:56 +09:00 |
|
Nicolas Le Goff
|
6b89c123e3
|
Merge pull request #1266 from kwemi/design-update-v1
fix #7, fix #11, fix #12
|
2015-03-06 11:44:38 +01:00 |
|
Olivier Mayer
|
67873d6645
|
fix #7, fix #11, fix #12
|
2015-03-06 18:55:03 +09:00 |
|
Benoît Burnichon
|
4b48e829f7
|
Add default data path in twig
|
2015-03-03 19:03:38 +01:00 |
|
Nicolas Le Goff
|
709af5bba0
|
Optim
|
2015-02-27 16:09:10 +01:00 |
|
Nicolas Le Goff
|
75a6bbe608
|
Fix status display
|
2015-02-24 15:28:29 +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 |
|
Olivier Mayer
|
a49acb03e4
|
Design update
|
2015-02-23 15:15:55 +09:00 |
|
Nicolas Le Goff
|
111755fa9b
|
Refactor status display
|
2015-02-19 15:14:23 +01:00 |
|
Olivier Mayer
|
50352c0e90
|
header size
fix #5
|
2015-02-19 18:35:18 +09:00 |
|
Olivier Mayer
|
1f2d79355f
|
Result number
fix #4
|
2015-02-19 18:29:45 +09:00 |
|
Olivier Mayer
|
bd4bb78b59
|
Double arrow
fix #3
|
2015-02-19 17:39:36 +09: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
|
d9f6306f8a
|
PHRAS-350 #fix add step by step tour guide
|
2015-02-17 19:23:35 +01:00 |
|
Nicolas Le Goff
|
03330db51f
|
Merge pull request #1241 from jygaulier/PHRAS-356
fix #PHRAS-356 time 2h
|
2015-02-16 18:45:41 +01:00 |
|
Jean-Yves Gaulier
|
4834095a56
|
fix #PHRAS-356 time 2h
|
2015-02-16 17:55:57 +01:00 |
|
Olivier Mayer
|
13a87a6181
|
Modification general layout
Change items size, color etc
|
2015-02-17 00:57:45 +09:00 |
|
Jean-Yves Gaulier
|
cc3f441025
|
fix #PHRAS-395 time 15m
|
2015-02-12 20:28:19 +01:00 |
|
Jean-Yves Gaulier
|
cad954ef63
|
fix #PHRAS-356 time 8h
tested ok with ie9, ie10, ie11, chrome
|
2015-02-12 19:14:43 +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
|
948971eba4
|
PHRAS-408 #fix
|
2015-02-11 19:47:48 +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
|
4e5dca3720
|
Fix javascript issues
|
2015-02-06 19:14:21 +01:00 |
|
Nicolas Le Goff
|
67423b9add
|
Fix thesaurus display
|
2015-02-06 16:16:54 +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
|
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
|
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 |
|