Harrys Ravalomanana
|
14869907db
|
PHRAS-3069 remove flash uploader switcher
|
2020-05-27 15:50:57 +04:00 |
|
aina-esokia
|
8ab2888850
|
port to 4.1 upload by url
|
2019-03-18 16:16:14 +04:00 |
|
Mike Ng
|
30f49bdd35
|
resolve conflict
|
2018-01-08 15:57:13 +04:00 |
|
Nicolas Maillat
|
62c7443333
|
Merge pull request #2420 from mike-esokia/PHRAS-1741_PORT_PHRAS-1616
PHRAS-1741 porting PHRAS-1616 to 4.1
|
2018-01-08 12:28:18 +01:00 |
|
Mike Ng
|
82d9ef86a4
|
porting PHRAS-1616 to 4.1
|
2018-01-03 17:08:02 +04:00 |
|
Mike Ng
|
9c3f65f3f7
|
load appropriate status based on store collection
|
2017-12-21 16:50:21 +04:00 |
|
Mike Ng
|
2811964f01
|
PORT PHRAS-1301/PHRAS-1676 to 4.1
|
2017-12-13 12:51:08 +04:00 |
|
Florian BLOUET
|
ea3abbeb54
|
wip: remove prod js modules dependencies
|
2016-03-18 10:08:08 +01:00 |
|
Florian BLOUET
|
5eec250624
|
modularize dialog Module (no more p4.dialog)
|
2016-03-18 10:08:07 +01:00 |
|
Florian Blouet
|
bb88854a6c
|
PHRAS-976 - upload manager, fix cancel button
|
2016-02-18 16:18:37 +01:00 |
|
Florian BLOUET
|
5d2735cd0a
|
update jquery attr into prop method for checked and disabled properties
|
2015-12-02 17:35:41 +01:00 |
|
Florian BLOUET
|
ff7daad804
|
wip: css cleanup
|
2015-12-02 17:35:39 +01:00 |
|
Florian BLOUET
|
0e97e4a0ae
|
moved skins/icon to assets/common/images/icons
|
2015-12-02 17:35:37 +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
|
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
|
111755fa9b
|
Refactor status display
|
2015-02-19 15:14:23 +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
|
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 |
|
Jean-Yves Gaulier
|
f71f7adf19
|
hide "use flash uploader" with ie >= 10
#time 8h
|
2015-02-05 14:20:44 +01:00 |
|
Nicolas Le Goff
|
5e895c66d6
|
Fix upload
|
2014-10-13 20:14:49 +02:00 |
|
Nicolas Le Goff
|
2899f152fb
|
Merge branch '3.8' into fix-latest-merge
Conflicts:
README.md
composer.json
composer.lock
config/configuration.sample.yml
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/API/V1/result.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskrun.php
lib/classes/set/export.php
lib/conf.d/_GV_template.inc
lib/conf.d/configuration.yml
templates/web/admin/setup.html.twig
templates/web/admin/tasks/list.html.twig
templates/web/api/auth/end_user_authorization.html.twig
templates/web/prod/actions/Feedback/list.html.twig
templates/web/prod/actions/publish/publish.html.twig
templates/web/prod/upload/upload.html.twig
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/api/v1/api_v1_resultTest.php
|
2014-08-11 20:28:03 +02:00 |
|
Nicolas Le Goff
|
94e502c12b
|
PHRAS-211 #fix status not applied
|
2014-07-23 19:02:40 +02:00 |
|
Romain Neutron
|
91057a9dcc
|
Merge pull request #1013 from nlegoff/fix-upload-img-overflow
[Ready][3.8] Fix canva overflow for thumbnail preview
|
2014-03-04 18:25:46 +01:00 |
|
Romain Neutron
|
2be779f30b
|
Merge pull request #1012 from nlegoff/fix1714
[Ready][3.8] Fix #1714 First status is not applied on document after upload
|
2014-03-04 14:25:04 +01:00 |
|
Nicolas Le Goff
|
e1ab77d4c3
|
Fix canva overflow for thumbnail preview
|
2014-03-04 12:24:22 +01:00 |
|
Nicolas Le Goff
|
85176bef9e
|
Fix #1714 First status is not applied on document after upload
|
2014-03-04 12:11:18 +01:00 |
|
Romain Neutron
|
12f9575a8b
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
lib/classes/API/OAuth2/Adapter.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Collection.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/User/Adapter.php
lib/classes/base.php
lib/classes/connection.php
lib/classes/databox/cgu.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/bridgeuploadfail.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/orderdeliver.php
lib/classes/eventsmanager/notify/ordernotdelivered.php
lib/classes/eventsmanager/notify/push.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/validate.php
lib/classes/eventsmanager/notify/validationdone.php
lib/classes/eventsmanager/notify/validationreminder.php
lib/classes/module/console/taskState.php
lib/classes/module/console/taskrun.php
lib/classes/record/adapter.php
lib/classes/registry.php
lib/classes/set/order.php
lib/classes/task/abstract.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/ftp.php
lib/classes/task/period/ftpPull.php
templates/web/prod/upload/lazaret.html.twig
|
2014-02-20 16:05:23 +01:00 |
|
Romain Neutron
|
4893b62fc6
|
Fix #1697 : Add pagination to quarantine
|
2014-02-19 11:37:47 +01:00 |
|
Nicolas Le Goff
|
3b9b5a3240
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
|
2014-02-05 15:25:52 +01:00 |
|
Romain Neutron
|
03fc818fe4
|
Fix upload box CSS
|
2014-02-05 13:07:46 +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
|
16c1930ca0
|
Update templates to fit the new translator
|
2013-12-03 20:02:40 +01:00 |
|
Romain Neutron
|
e7421e1fdd
|
Fix twig tags
|
2013-12-03 20:02:39 +01:00 |
|
Nicolas Le Goff
|
7e1fafc5bb
|
Fix #1414 Add immediate thumbnail substitution after success download
|
2013-09-02 12:12:36 +02:00 |
|
Nicolas Le Goff
|
db359920c8
|
Fix #1414 Add immediate thumbnail substitution after success download
|
2013-08-08 16:25:16 +02:00 |
|
Nicolas Le Goff
|
c5580ce746
|
Fix #1408 JS performance selector issue
|
2013-08-07 15:33:24 +02:00 |
|
Romain Neutron
|
a9e3d5ef63
|
Fix #1303 : Enhance upload selected files quantity display
|
2013-07-12 10:35:24 +02:00 |
|
Nicolas Le Goff
|
764fa42f14
|
Update to jquery ui 1.10.3
Fix conflict & ui bugs
Remove debug
|
2013-06-21 13:46:16 +02:00 |
|
Romain Neutron
|
906d4ba9c5
|
Localize status bits
|
2013-06-14 09:47:54 +02:00 |
|
Romain Neutron
|
1a13d02c2a
|
Remove status bit name, use only labels
|
2013-06-14 09:47:53 +02:00 |
|
Romain Neutron
|
f9b4978569
|
Merge pull request #390 from romainneutron/databox-labels
[3.8] Add labels to databoxes
|
2013-06-13 07:41:05 -07:00 |
|
Romain Neutron
|
11a55bbd43
|
Add labels to databoxes
|
2013-06-13 09:45:43 +02:00 |
|
Romain Neutron
|
4161ef2e31
|
Use url generator everywhere
|
2013-06-13 09:44:16 +02:00 |
|
Romain Neutron
|
c084f20f85
|
Labelize collections
|
2013-06-01 01:29:07 +02:00 |
|
Nicolas Le Goff
|
47022c2210
|
Fix #836 Remove title attribute & fix minor css issue
|
2013-05-29 12:40:29 +02:00 |
|
Nicolas Le Goff
|
3ff788de1a
|
Fix #987 Display number of files uploaded
|
2013-05-28 17:10:52 +02:00 |
|
Romain Neutron
|
dff686c87d
|
Merge branch '3.7'
|
2013-01-09 11:25:14 +01:00 |
|
Nicolas Le Goff
|
67abd2d0c4
|
Fix #1047 Change from bit to byte
Fix some issues
|
2013-01-02 13:55:53 +01:00 |
|
Nicolas Le Goff
|
5abd5691af
|
Fix #1048 Upload is possible when no database is available
|
2013-01-02 13:52:58 +01:00 |
|