Harrys Ravalomanana
a4a5fac254
PHRAS-2894 #comment Fix Quarantine allow to substitute without selecting target Record #time 2h"
...
git commit -m PHRAS-2894
2020-01-31 14:15:56 +04:00
Harrys Ravalomanana
02e670880d
PHRAS-2761 #comment Port of PHRAS-2801 (Fix on firefox)
2019-10-29 18:11:46 +04:00
Harrys Ravalomanana
df86aac2ba
PHRAS-2766 #comment port 41 Add status change capabilities to quarantine #time 3h
2019-10-29 16:48:14 +04:00
Harrys Ravalomanana
e0ee90e3af
PHRAS-2761 #comment add status change to quarantine #time 8h
2019-10-01 16:10:46 +04:00
aina-esokia
8ab2888850
port to 4.1 upload by url
2019-03-18 16:16:14 +04:00
aina-esokia
39ec2d5e56
fix quarantine substitue action
2018-10-10 18:29:24 +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
Thibaud Fabre
97f2e66698
Merge 4.0 branch
2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f
Merge branch 4.0
2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
6a2285f66d
PHRAS-508_acl-cache
...
- wip
2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
837a294827
PHRAS-1192_quarantaine-by-filenames_4.0
...
- add : quarantine thumbnails looks like result thb (zoom, caption, infos, ...) by using the same template
- removed : some code about highlighting titles
- fix : double extension on exported files
2016-09-28 13:16:10 +02:00
Florian Blouet
bb88854a6c
PHRAS-976 - upload manager, fix cancel button
2016-02-18 16:18:37 +01:00
Florian BLOUET
c79ae180a2
fix upload quarantine buttons style
2015-12-17 12:45: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
Florian BLOUET
285edaf504
wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)
2015-12-02 17:35:36 +01:00
Benoît Burnichon
4880f2bf5a
Add getAuthenticator usage
...
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
2015-07-02 12:33:18 +02:00
Benoît Burnichon
0ce4fd3192
Change to use border-manager as checker registry.
2015-03-17 16:55:55 +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
4834095a56
fix #PHRAS-356 time 2h
2015-02-16 17:55:57 +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
4c9feeffc7
Merge pull request #1234 from jygaulier/PHRAS-370
...
fix #PHRAS-370
2015-02-11 19:48:45 +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
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
862fe696cb
Remove some circular references
2014-02-20 20:09:14 +01:00
Romain Neutron
4c29ea5a7a
Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users
...
Conflicts:
lib/classes/ACL.php
lib/classes/User/Adapter.php
lib/classes/eventsmanager/notify/autoregister.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/report/add.php
lib/classes/module/report/edit.php
lib/classes/module/report/push.php
lib/classes/module/report/sent.php
lib/classes/module/report/validate.php
lib/classes/record/preview.php
2014-02-20 18:02:27 +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
Nicolas Le Goff
eaa1feb765
Address PR comments
2014-02-19 17:29:27 +01:00
Nicolas Le Goff
b341495c88
Fix tests
2014-02-19 17:29:26 +01:00
Nicolas Le Goff
26bd977d5f
Delete references to usr.usr_id field in entities
...
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
lib/conf.d/migrations.yml
Conflicts:
lib/Alchemy/Phrasea/ACL/BasketACL.php
lib/Alchemy/Phrasea/Authentication/Authenticator.php
lib/Alchemy/Phrasea/Controller/Prod/Order.php
lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Model/Entities/Basket.php
lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
lib/Alchemy/Phrasea/Model/Entities/Feed.php
lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
lib/Alchemy/Phrasea/Model/Entities/Session.php
lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
lib/Alchemy/Phrasea/Model/Entities/UsrList.php
lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
lib/classes/API/V1/adapter.php
templates/mobile/lightbox/sc_note.html.twig
templates/web/admin/connected-users.html.twig
templates/web/admin/publications/fiche.html.twig
templates/web/lightbox/IE6/agreement_box.html.twig
templates/web/lightbox/agreement_box.html.twig
templates/web/lightbox/basket_content_report.html.twig
templates/web/lightbox/sc_note.html.twig
templates/web/prod/WorkZone/Browser/Basket.html.twig
templates/web/prod/WorkZone/Browser/Results.html.twig
templates/web/prod/WorkZone/Macros.html.twig
templates/web/prod/actions/Feedback/List-Share.html.twig
templates/web/prod/actions/Feedback/ListsMacros.html.twig
templates/web/prod/orders/order_box.html.twig
templates/web/prod/orders/order_item.html.twig
templates/web/prod/upload/lazaret.html.twig
tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
2014-02-19 17:29:25 +01:00
Nicolas Le Goff
c156f842c7
Remove User_Adapter
2014-02-19 17:28:53 +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
