hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,080 Commits 268 Branches 107 Tags
b0eba5217c591b45c4037f7e3a1bf37cd68b09c5
Commit Graph

154 Commits

Author SHA1 Message Date
Aina Sitraka
ea4e80f074 PHRAS-3668 fix incomplete translation (#4418) 2023-11-23 17:32:51 +01:00
Aina Sitraka
1ccba2d9a0 PHRAS-3668 subtitle notification (#4416) 
* subtitle notification

* fix notif
 2023-11-22 12:15:30 +01:00
Aina Sitraka
51c71dc6f0 PHRAS-3851 Untranslated terms : in Notifications, Detailed View, Map (#4351) 
* untranslated geoloc tab, validate - preview resultat

* fix notification translation

* PHRAS-2642 alt text video records
 2023-07-28 14:15:15 +02:00
jygaulier
e7027c7220 PHRAS-3800_xss (#4219) 
* add encode option to record::get_title ; render preview.record_title in twig

* html-escape facet values
 2023-03-15 11:05:34 +01:00
Aina Sitraka
9477c9b340 PHRAS-2948 Lazaret ( quarantine ) - disabled a checker cause a 500 error (#4241) 2023-02-07 10:00:37 +01:00
Aina Sitraka
f004015f64 PHRAS-3662 Share Basket fix GUI - icons color and behavior (#4007) 
* fix some display icon

* update translation

* fix icon size

* fix context color, set order

* remove search background

* change color share, refresh workzone

* fix icon active

* remove ccs from js file

* remove css in js file

* fix
 2022-04-28 12:11:55 +02:00
jygaulier
fbccec009e PHRAS-3602_shared-baskets-step1 WIP DO NOT MERGE (#3929) 
* PHRAS-3602 : migrate validations to baskets
WIP [skip ci]

* PHRAS-3602 : migrate validations code to baskets code (wip)
WIP [skip ci]

* PHRAS-3602 : migrate validations to baskets
WIP [skip ci]

* PHRAS-3602 : migrate validations to baskets
WIP [skip ci]

* PHRAS-3602 : fake commit to run tests

* PHRAS-3602 : migrate validations to baskets
fix typo

* PHRAS-3602 : migrate validations to baskets
fixed (some) tests

* PHRAS-3602 : migrate validations to baskets
fixed (some) tests

* PHRAS-3602 : migrate validations to baskets
fixed (some) tests. need to remove method():return_type signature because of old phpunit which does not mock it

* PHRAS-3602 : migrate validations to baskets
fix

* PHRAS-3602 : migrate validations to baskets
fix err 500 when a "vote" (feedback) is deployed in wz

* PHRAS-3602 : migrate validations to baskets
fix missing votes for element+participant
fix update vote dates on basket

* PHRAS-3602 : ux
bump production-client to 34
WIP [skip ci]

* PHRAS-3602 : rebase (bump production-client to 37)
WIP [skip ci]

* PHRAS-3602 : refacto css/twig/templates/... ; replace many png's by fonts
WIP [skip ci]

* PHRAS-3602 : fix icon / css
WIP

* PHRAS-3602 : better icon align ; back button color
fix : save button after adding a user
WIP [skip ci]

* PHRAS-3602 : restore sharebasket controller
todo : implement modification right ; owner is participant ?
WIP [skip ci]

* PHRAS-3602 : set "canModifiy" ; cleanup
WIP [skip ci]

* PHRAS-3602 : respect "can_modify" on shared basket
WIP [skip ci]

* PHRAS-3602 : fix badge icon bg ; fix button css
WIP [skip ci]

* PHRAS-3602 : fix css & cleanup
WIP [skip ci]

* PHRAS-3602 : fix 500 on preview/feedback tab
WIP [skip ci]

* PHRAS-3602 : fix allow to display dlg without selection

* PHRAS-3602 : bump version to 4.1.6-rc1 ; prodclient=38
WIP [skip ci]

* PHRAS-3602 : factorize baskets menu (wip)
WIP [skip ci]

* PHRAS-3602 : modify already shared or feedback basket (general menu)
4th icon on badges (vote != modify)
quitshare option (todo back)
allow fa-icons in toolbar

WIP [skip ci]

* PHRAS-3602 : add share end-date (todo:db write)
add 4th general toggle button
fix badge selection bug
fix css badges zone (form position)
WIP [skip ci]

* PHRAS-3602 : big refacto to use "sharebasket" vocab.
fusion "feedback/sharebasket" removed "feedback"
adaptative ux: 1 "can_agree" ==> feedback display
bump production-client to v50
todo: save shr/fbk end-dates
todo: rename "pushXXX" to pushAndShare ?
WIP [skip ci]

* PHRAS-3602 : share / feedback expiration dates are saved in db
date pickers with delta menu
better adaptive ux
todo: move select general togglers
WIP [skip ci]

* PHRAS-3602 : revert validation* tables (remove "dead" rename)
drop all foreign keys from validation*
WIP [skip ci]

* PHRAS-3602 : restore deleted fields in validation, regenerate proxies
WIP [skip ci]

* PHRAS-3602 : fix initiator_id
WIP [skip ci]

* fix initiator_id-bis

* PHRAS-3602 : css for input-text with glued button
dynamic load of users-lists (left zone) = less duplicated code
fix : users-lists  works after refresh
WIP [skip ci]

* PHRAS-3602 : fix users-lists manager (orange) : go flex !

* PHRAS-3602 : empty dist to ease rebase
WIP [skip ci]

* PHRAS-3602 : rebase
WIP [skip ci]

* PHRAS-3602 : new ux for "owner"
feedback mode is an independent toggle
fix "missing mandatory parameter"
WIP [skip ci]

* PHRAS-3602 : fix css of owner badge
WIP [skip ci]

* PHRAS-3602 : fix handling of feedback initiator
WIP [skip ci]

* PHRAS-3602 : better wss to follow "skins"
full roboto
removed useless class "with-button"
WIP [skip ci]

* PHRAS-3602 : fix "a token require a validation"
temporary fix 500 due to send email to (null) vote-initiator for simple share
todo: send a specific email for simple share
WIP [skip ci]

* PHRAS-3602 : different emails depending if user can vote or not
WIP [skip ci]

* PHRAS-3602 : expired shared baskets removed from wz
WIP [skip ci]

* PHRAS-3602 : fix logic error on last sql
WIP [skip ci]

* PHRAS-3602 : fix missing shared baskets on wz
WIP [skip ci]

* PHRAS-3602 : fix blinking of wz/basket detail
now only the title:hover displays detail
WIP [skip ci]

* PHRAS-3602 : rebase
WIP [skip ci]

* PHRAS-3602 : update basket proxy
WIP [skip ci]

* PHRAS-3602 : fix forever "unread" basket
WIP [skip ci]

* PHRAS-3602 : fix display of unread basket ; sync "eye" icon with css change
WIP [skip ci]

* PHRAS-3602 : "quitshare" action works
WIP [skip ci]

* PHRAS-3602 : missing dist files
WIP [skip ci]

* PHRAS-3602 : cleanup & run ci

* PHRAS-3602 : disable failing unit test ; remove blue on onread basket

* PHRAS-3602 : separate "vote" & "share" emails templates & u-tests

* PHRAS-3602 : add 2 icons "stack" to icomoon set
WIP [skip ci]

* PHRAS-3602 : fix test

* PHRAS-3602 : fix test ; add test for simple share email notification

* PHRAS-3602 : changed proxy

* PHRAS-3602 : colored basket icons
WIP [skip ci]

* PHRAS-3602 : circle basket icons
WIP [skip ci]

* PHRAS-3602 : fix wz filters, add "share" filter.
todo: fix fr writing (new string)
WIP [skip ci]

* PHRAS-3602 : fix "share" dichotomy : use "shared" for wz filter
WIP [skip ci]

* PHRAS-3602 : fix PHRAS-3624 ; PHRAS-3623 ; now adding/removing a user from user list is immediate (no more save button)
WIP [skip ci]

* PHRAS-3602 : fix PHRAS-3647 ; shared basket are listed in api (for list and related record)

* PHRAS-3602 : fix due to failing test

* PHRAS-3602 : fix: can load a 1000 users list
todo : move slow code to worker

* PHRAS-3602 : fix due to failing test

* PHRAS-3468 : (fixed in 3602) fix basket content still visible when baskets are hidden (wz-filter)

* PHRAS-3602 : add "wip" baskets with notification & lock
todo : move slow code from message to worker

* PHRAS-3602 : fix tests due to accidental rename

* PHRAS-3602 : fix : menu closes when mouse out : bump to 4.1.6-rc3
todo : fast move to another basket makes the menu appear on top ?

* add shareBasket worker

* fix test

* PHRAS-3602 : fix : rights buttons on badges now works for users added from search (did work only from loading list)

* PHRAS-3590

Co-authored-by: aynsix <asr@esokia-webagency.com>
Co-authored-by: Nicolas Maillat <maillat@alchemy.fr>
 2022-04-07 17:07:43 +02:00
aynsix
b4ee059c65 PHRAS-3524 fix basket click 2021-09-10 14:40:05 +03:00
aynsix
90ef036c05 PHRAS-3522 fix uninterpreted html in notification 2021-09-09 14:23:56 +03:00
aina esokia
6dac901bb7 PHRAS-3277 fix displaying old notification reminder data 2020-12-11 16:38:56 +03:00
aina esokia
427216ec43 PHRAS-3277 validation reminder in percent 2020-12-02 17:31:05 +03:00
Harrys Ravalomanana
b08ae5c2fa PHRAS-2910 #comment Fix Order manager : action from notification in menu bar #time 4h 2020-02-11 17:21:03 +04:00
Jean-Yves Gaulier
2fcbd7e6d7 PHRAS-2666_slow-notifications_4.1 
removed join on basket_elements where useless
code style + type hints
!!! WIP !!!
 2019-07-25 17:23:10 +02: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
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Florian BLOUET
755aac9e3e PHRAS-1038 - fix story navigation in workzone context 2016-03-22 17:17:01 +01:00
Benoît Burnichon
f2e62abd8b Remove !count() calls 2016-03-11 18:03:53 +01:00
Benoît Burnichon
14fffe314a PHPCS 2016-02-10 19:38:30 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Florian BLOUET
eaa1b8501c PHRAS-880 - add quarantine icon 2015-12-17 13:20:33 +01:00
Florian BLOUET
49d4e7b4a6 wip: stylesheets cleanup 2015-12-02 17:35:38 +01:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Benoît Burnichon
d645b92afa Add AclAware Trait 2015-07-02 12:33:18 +02: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
Benoît Burnichon
9a115726f4 Remove use of LazaretCheck::getMessage() static calls 
LazaretCheck should not perform the translations.

It would be better to have Checker registry to find checker to use.
 2015-03-17 15:59:53 +01:00
Olivier Mayer
a49acb03e4 Design update 2015-02-23 15:15:55 +09: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
d82adbf109 Bump year to 2015 2015-01-20 14:08:25 +01:00
Romain Neutron
c4bf6c3c67 Convert custom events to symfony events 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
66fa05f4ee Fix CS 2014-07-17 15:17:04 +02:00
Nicolas Le Goff
0d040519f3 Add third party application webhook event 2014-06-23 17:48:42 +02:00
Nicolas Le Goff
1250f8ab0b Fix latest merge 2014-06-19 16:11:27 +02:00
Nicolas Le Goff
a8da584666 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/Collection.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Prod/Language.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
	lib/Alchemy/Phrasea/Controller/Report/Informations.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Developers.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
	lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/ZipArchiveImproved.php
	lib/classes/caption/Field/Value.php
	lib/classes/caption/record.php
	lib/classes/eventsmanager/notify/feed.php
	lib/classes/media/subdef.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/export.php
	lib/classes/setup.php
	lib/classes/task/abstract.php
	lib/classes/task/period/emptyColl.php
	lib/classes/uuid.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/bases_structure.xml
	lib/conf.d/configuration.yml
	lib/conf.d/minifyGroupsConfig.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/account/account.html.twig
	templates/web/account/base.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/admin/index.html.twig
	templates/web/admin/setup.html.twig
	templates/web/admin/tree.html.twig
	templates/web/client/index.html.twig
	templates/web/common/caption.html.twig
	templates/web/common/caption_templates/answer.html.twig
	templates/web/common/caption_templates/basket_element.html.twig
	templates/web/common/caption_templates/internal_publi.html.twig
	templates/web/common/caption_templates/lazaret.html.twig
	templates/web/common/caption_templates/overview.html.twig
	templates/web/common/caption_templates/preview.html.twig
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/indexfloat.html.twig
	templates/web/common/thumbnail.html.twig
	templates/web/developers/application_form.html.twig
	templates/web/lightbox/IE6/feed.html.twig
	templates/web/lightbox/IE6/validate.html.twig
	templates/web/lightbox/feed.html.twig
	templates/web/lightbox/validate.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/preview/caption.html.twig
	templates/web/prod/results/answerlist.html.twig
	templates/web/thesaurus/accept.html.twig
	templates/web/thesaurus/export-text-dialog.html.twig
	templates/web/thesaurus/export-text.html.twig
	templates/web/thesaurus/export-topics-dialog.html.twig
	templates/web/thesaurus/export-topics.html.twig
	templates/web/thesaurus/index.html.twig
	templates/web/thesaurus/link-field-step1.html.twig
	templates/web/thesaurus/link-field-step2.html.twig
	templates/web/thesaurus/link-field-step3.html.twig
	templates/web/thesaurus/new-term.html.twig
	templates/web/thesaurus/properties.html.twig
	templates/web/thesaurus/search.html.twig
	templates/web/thesaurus/thesaurus.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
	tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
	tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
	tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
	tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJSONPTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
	tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
	tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
	tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
	tests/classes/Feed/Feed_AggregateTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/db-ref.sqlite
 2014-06-17 15:30:41 +02:00
Nicolas Le Goff
53c2f7b5e0 Always send webhook 2014-05-28 15:48:12 +02:00
Nicolas Le Goff
2ccd478a6b Add webhooks only if feed notify_email is set to true 2014-05-06 10:53:29 +02:00
Nicolas Le Goff
9e9cfa3c5f Add new feed entry web hook when creating a new feed entry 2014-05-06 10:53:29 +02:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +01:00
Romain Neutron
06f29575c7 Fix hidden use of repositories 2014-02-28 20:02:24 +01:00
Romain Neutron
fd53a38b0f Add order-element repository as a service 2014-02-28 20:01:58 +01:00
Romain Neutron
20aea6de2a Add feed-entry repository as a service 2014-02-28 20:01:23 +01:00
Romain Neutron
a72d8ccabc Add registration and basket repositories as a service 2014-02-28 20:00:27 +01:00
Romain Neutron
8f87e8b1c8 Add user repository as a service 2014-02-28 19:58:12 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
c98fe4c23d Adressed Neutron's comments 2014-02-26 12:06:34 +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
ace5efce78 Fix CS 2014-02-20 15:31:13 +01:00