gjacobjn
3c1c6c41f5
Fix in template
2020-02-06 14:17:51 +01:00
Jean-Yves Gaulier
77e262bad0
PHRAS-2581_twig-macro-explode_4.1
...
explode commmon/macros.html.twig in 3 files for 3 macros
2019-05-16 17:27:40 +02:00
aina-esokia
eff72083ba
update delete account config structure
...
#time 0.5h
2019-04-25 17:27:33 +04:00
aynsix
5cdf473c7f
PHRAS-1972: Account Page, Allow a Phraseanet User to delete his account and associated datas ( #2918 )
...
* allow user to delete account
* generate translation and add checkbox in the windows confirmation
* change text an configuration key
* update delete account fonctionality
* rename variable
* write in explicite condition
* merge yarn.lock
* regenerate translation
2019-04-08 14:25:17 +02:00
Xavier Rousset
a8ebe5fc43
Update access page design
2018-10-19 19:10:39 +02:00
Mike Ng
802c52d7ff
refatored html code to use proper font-awesome classes
2018-01-19 13:32:20 +04:00
Mike Ng
53b8ca4087
Porting PHRAS-1586/PHRAS-1602 to 4.1
2017-12-22 11:15:17 +04:00
Thibaud Fabre
b5bbb1851f
Merge branch 4.0
2016-12-05 15:26:48 +01:00
Xavier Rousset
7945994140
PHRAS-1173 SQL fix and template update
2016-10-11 15:27:13 +02:00
Florian BLOUET
79b7aba666
PHRAS-1046 - fix CGU content disposition in account
2016-05-12 10:39:44 +02:00
Florian BLOUET
285edaf504
wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)
2015-12-02 17:35:36 +01:00
Nicolas Le Goff
5a62787b85
Fix geonames amd loading
2015-02-06 16:04:18 +01:00
Nicolas Le Goff
e139202f3b
Fix latest merge
2014-06-25 16:02:35 +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
759a205025
Fix phras-46 display passwords fields as 'password' input
2014-04-23 16:49:37 +02:00
Nicolas Le Goff
445ac04b69
PHRAS-68 Context menu is disable for menu bar in account template
2014-04-10 19:03:53 +02:00
Nicolas Le Goff
af81e9d84b
Fix method calls in templates
2014-03-24 12:28:19 +01:00
Nicolas Le Goff
e818b7da29
Replace method calls in template
2014-03-24 12:28:18 +01:00
Nicolas Le Goff
fd38ec9b79
Delete references to API_OAuth2_Account class
2014-03-24 12:28:17 +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
52f3baac05
Fix neutron's comment
2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73
Migrate demand table to doctrine entity && refactor registration API
2014-02-26 12:06:34 +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
4cc82af980
Fix settings
2014-02-19 17:29:26 +01:00
Nicolas Le Goff
53ae0ccc24
Remove User_Adapter Inteface References
2014-02-19 17:29:25 +01:00
Nicolas Le Goff
54a5d6578c
Replace getter and setter for user & user notif setting value
2014-02-19 17:28:53 +01:00
Nicolas Le Goff
c156f842c7
Remove User_Adapter
2014-02-19 17:28:53 +01:00
Romain Neutron
64456a8964
Remove phraseanet registry
2013-12-20 16:44:22 +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
e4c43b8622
Use TranslationServiceProvider, fix use of form_div_layout
2013-12-03 20:02:39 +01:00
Romain Neutron
e7421e1fdd
Fix twig tags
2013-12-03 20:02:39 +01:00
Romain Neutron
432252f5f8
Merge branch '3.8'
...
Conflicts:
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/User/Adapter.php
lib/classes/eventsmanager/broker.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/uploadquarantine.php
lib/classes/eventsmanager/notify/validationdone.php
templates/web/admin/index.html.twig
2013-11-12 19:19:13 +01:00
Romain Neutron
bea211074b
Fix #1571 : Cleanup user settings, fix user settings calls
2013-11-12 15:16:54 +01:00
Romain Neutron
1c27778001
Merge branch '3.8'
...
Conflicts:
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
2013-10-31 17:56:48 +01:00
Romain Neutron
24a6dce598
Fix #1555 : API sessions remains open
2013-10-31 15:19:24 +01:00
Romain Neutron
1dfbff5666
Merge branch '3.8'
...
Conflicts:
CHANGELOG.md
bin/developer
lib/classes/module/console/systemUpgrade.php
www/skins/report/jquery-ui.css
2013-10-03 15:29:22 +02:00
Romain Neutron
d6d3ffa243
Fix #1510 : Fix API application status display
2013-10-03 12:20:02 +02:00
Nicolas Le Goff
6a8312ca64
Add FtpCredentials entity
2013-08-23 12:09:50 +02:00
Nicolas Le Goff
7d8e93bddd
Fix assets path
2013-08-17 17:12:57 +02:00
Romain Neutron
467c2b290f
Merge pull request #560 from nlegoff/fix_alert
...
[3.8] Fix #1411 Cannot close alert
2013-08-08 05:54:54 -07:00
Romain Neutron
acd7e18646
Merge pull request #557 from nlegoff/fix_1413
...
[3.8] Fix #1413 Add possibility to delete a persistent session
2013-08-08 03:27:35 -07:00
Nicolas Le Goff
307a6af069
Fix #1413 Add possibility to delete a persistent session
2013-08-08 12:26:39 +02:00
Nicolas Le Goff
9ecfc82b9f
Fix #1411 Cannot cloe alert
2013-08-08 12:06:25 +02:00
Nicolas Le Goff
92282dd0d4
Fix #1412 Set defaut gender to empty value
2013-08-07 19:35:33 +02:00
Romain Neutron
dcb332a7d6
Add links to homepage
2013-07-10 19:44:48 +02:00
Nicolas Le Goff
3034ce1d78
Add city retrieval from geonamed id on input creation
2013-07-04 14:20:23 +02:00
Nicolas Le Goff
5e151e632a
adressed comment's
2013-07-04 02:49:11 +02:00
