hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,995 Commits 268 Branches 107 Tags
09c74afab613301fcc3d3ad9d5942cf070b5a09a
Commit Graph

1353 Commits

Author SHA1 Message Date
Romain Neutron
09c74afab6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
 2013-12-18 12:12:58 +01:00
Romain Neutron
9d42d5b64d Merge pull request #843 from romainneutron/fix-1622 
[3.8] Fix #1622 : Sanitize captions display
 2013-12-18 01:48:35 -08:00
Romain Neutron
330b1b34bb Merge pull request #850 from romainneutron/fix-1624 
[3.8] Fix #1624 : Some report locales might be broken
 2013-12-18 01:19:54 -08:00
Romain Neutron
1cc3885656 Fix #1624 : Some report locales might be broken 2013-12-17 19:41:58 +01:00
Romain Neutron
f0d632073b Fix #1622 : Sanitize captions display 2013-12-17 18:31:56 +01:00
Romain Neutron
c0c640aaee Fix #1626 : FTP test displays empty message 2013-12-17 11:57:50 +01:00
Romain Neutron
c788daa1e9 Merge pull request #833 from nlegoff/fix_1607 
[3.8] Fix #1607 Reoder collections is not working
 2013-12-16 05:18:53 -08:00
Nicolas Le Goff
2662ead699 Fix #1607 Reoder collections is not working 
Conflicts:
	lib/classes/collection.php
 2013-12-16 13:27:19 +01:00
Romain Neutron
816a53a54e Merge pull request #838 from romainneutron/fix-1605 
[3.8] Fix #1605 : Add advanced search reset on production load.
 2013-12-11 14:48:40 -08:00
Romain Neutron
aac9138b18 Fix division by 0 in case a thumbnail has a width or height equal to 0 2013-12-11 11:44:29 +01:00
Romain Neutron
2cb9dda244 Fix #1605 : Add advanced search reset on production load. 2013-12-10 11:48:17 +01:00
Romain Neutron
9580ff7585 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig
 2013-12-09 14:17:03 +01:00
Romain Neutron
ca5fc9add8 Merge pull request #827 from nlegoff/fix1609 
[3.8] Fix #1609 & #1608
 2013-12-09 04:20:23 -08:00
Nicolas Le Goff
4e3abb9044 Fix #1616 Suggested values editing not working on mozilla firefox 2013-12-06 15:46:26 +01:00
Nicolas Le Goff
75fd59d57b Fix #1609 & #1608 confirmation popup is not working 2013-12-06 14:14:56 +01:00
Nicolas Le Goff
1ffc6a2331 Display Termls of use in a new browser tab 2013-12-05 15:40:40 +01:00
Romain Neutron
420df7febd Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
	lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
	lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
	lib/conf.d/Doctrine/Entities.Session.dcm.yml
	lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
	lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
 2013-12-03 21:19:20 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
458aac8dd8 Add JMS translation tools 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
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
f519d3e8b8 Fix route generation parameters 2013-12-03 19:41:25 +01:00
Romain Neutron
4f31cfeefc Merge branch '3.8' 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
 2013-12-02 18:17:38 +01:00
Romain Neutron
8729bb094f Fix #1602 : Use localisation for datepicker placeholder 2013-12-02 18:07:48 +01:00
Romain Neutron
7285717b80 Merge pull request #815 from nlegoff/menubar 
[3.8] Add block to override menu bar title
 2013-11-28 07:15:09 -08:00
Romain Neutron
18f63b4ce7 Merge pull request #817 from nlegoff/technical_data 
[3.8] Wrap technical data into blocks
 2013-11-28 05:07:45 -08:00
Romain Neutron
a518b7cc68 Merge pull request #812 from romainneutron/fix-1596 
[3.8] Fix #1596 : Add datepicker input placeholder
 2013-11-28 05:05:46 -08:00
Nicolas Le Goff
7bbf00ff4b Wrap technical data into blocks 2013-11-28 13:29:25 +01:00
Nicolas Le Goff
e2fcd816cc Add block to override menu bar title 2013-11-28 12:38:24 +01:00
Romain Neutron
deb5e7ea75 Fix #1596 : Add datepicker input placeholder 2013-11-28 11:29:04 +01:00
Nicolas Le Goff
7384a376b6 Fix #1588 Error 400 when send email test 2013-11-28 11:24:08 +01:00
Romain Neutron
5504f9013a Merge pull request #805 from nlegoff/fix1584 
[3.8] Fix #1584 Unable to order medias
 2013-11-27 03:12:47 -08:00
Nicolas Le Goff
52a8d9672c Fix #1584 Unable to order medias 
Conflicts:
	templates/web/prod/Baskets/Reorder.html.twig
 2013-11-27 12:09:55 +01:00
Nicolas Le Goff
86b4e83054 Fix #1590 IE popup Error message: "A script on this page is causing Internet Explorer to run slowly" 2013-11-26 14:42:08 +01:00
Romain Neutron
8663f49228 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-20 15:53:50 +01:00
Romain Neutron
ce05724cd3 Fix #1586 : jQuery UI error in thesaurus tab selection 2013-11-20 13:54:55 +01:00
Romain Neutron
b973e40577 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bower.json
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-15 19:04:45 +01:00
Romain Neutron
60d4ee03e6 Fix html escaping 2013-11-15 16:09:43 +01:00
Romain Neutron
3451895515 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-14 17:52:52 +01:00
Romain Neutron
fda56a74c9 Merge pull request #774 from romainneutron/basket-manipulator 
[3.9] Add basket converter
 2013-11-14 08:51:35 -08:00
Romain Neutron
84c444c186 Fix editing default user settings 2013-11-14 13:29:49 +01:00
Romain Neutron
3548421160 Add basket converter 2013-11-13 17:52:12 +01:00
Romain Neutron
dca6667052 Merge branch '3.8' 2013-11-13 17:07:45 +01:00
Nicolas Le Goff
7c36829f11 Fix #1570 Remove accept tou link if there are no TOU 2013-11-12 19:59:54 +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
80f6209591 Merge pull request #773 from romainneutron/fix-1573 
[3.8] Fix #1573 : Propose rights reset prior apply template
 2013-11-12 07:52:16 -08:00
Romain Neutron
bea211074b Fix #1571 : Cleanup user settings, fix user settings calls 2013-11-12 15:16:54 +01:00