hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,023 Commits 268 Branches 107 Tags
c3df531f59d2912e08cb22d998b456f59c3c1c21
Commit Graph

2266 Commits

Author SHA1 Message Date
Romain Neutron
c3df531f59 Move main "languages" and "servername" to top level, "task-manager" and "binaries" to main configuration 2013-12-20 11:43:41 +01:00
Romain Neutron
af807431b1 Add configuration form types 2013-12-20 11:43:41 +01:00
Romain Neutron
ff9fb0404d Merge pull request #856 from romainneutron/tests-phaze2 
[3.9] Add improvements to unit tests
 2013-12-20 02:43:20 -08:00
Romain Neutron
6c45e8d40a Add improvements to unit tests 2013-12-20 10:51:35 +01:00
Romain Neutron
bfe5da79d2 Merge branch '3.8' 
Conflicts:
	lib/classes/User/Adapter.php
	lib/conf.d/bases_structure.xml
 2013-12-20 09:53:09 +01:00
Romain Neutron
49ea64b1c3 Fix array declarations 2013-12-19 10:50:42 +01:00
Romain Neutron
ecf516406a Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php
 2013-12-19 10:31:52 +01:00
Romain Neutron
7ee36ce3fa Merge pull request #846 from nlegoff/fix1630 
[3.8] Fix #1630 Accept user demand inscription
 2013-12-19 01:25:51 -08:00
Romain Neutron
c34a044417 Merge pull request #847 from nlegoff/fix1619 
[3.8] Fix #1619 Upgrade migration, checks if sbas exists before getting connec...
 2013-12-19 01:24:59 -08:00
Romain Neutron
273612875f Merge pull request #852 from romainneutron/doctrine 
[3.9] Move Doctrine proxies
 2013-12-19 01:23:47 -08:00
Romain Neutron
1d9a067418 Fix highlight 2013-12-19 00:35:20 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Nicolas Le Goff
3f54fb3f20 Fix #1630 : Fix user registration management 2013-12-18 20:00:09 +01:00
Romain Neutron
ccec86c695 Fix namespace use 2013-12-18 19:17:53 +01:00
Romain Neutron
792a8eff62 Move Doctrine proxies 2013-12-18 18:40:11 +01:00
Nicolas Le Goff
7f1e1d88cb Fix PHP notice when migrating from 3.6 to 3.8 2013-12-18 16:53:40 +01:00
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
33f709e985 Add missing files 2013-12-18 11:58:26 +01:00
Romain Neutron
1465678512 Merge pull request #845 from romainneutron/fix-1627 
[3.8] Fix #1627 : FTP receiver does not get its email
 2013-12-18 02:52:13 -08:00
Romain Neutron
1f88435910 Fix tests 2013-12-18 10:47:17 +01:00
Romain Neutron
a165907b95 Fix #1627 : FTP receiver does not get its email 2013-12-18 10:47:16 +01:00
Romain Neutron
f0d632073b Fix #1622 : Sanitize captions display 2013-12-17 18:31:56 +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
2cb9dda244 Fix #1605 : Add advanced search reset on production load. 2013-12-10 11:48:17 +01:00
Romain Neutron
1e3b3a1b60 Fix latest merges 2013-12-09 19:19:53 +01:00
Nicolas Le Goff
d58d74d5fc Fix #1613 Can not launch lightbox 2013-12-06 17:53:23 +01:00
Romain Neutron
6519e26888 Fix SphinxSearchEngineSubscriber namespace 2013-12-05 12:14:03 +01:00
Romain Neutron
04a6bb1486 Fix latest merge, add missing repository method 2013-12-04 12:48:33 +01:00
Romain Neutron
1ba41c4421 Fix latest merge 2013-12-04 08:20:58 +01:00
Romain Neutron
a59e501104 Fix previous merge 2013-12-03 21:34:34 +01:00
Romain Neutron
e0c1f600dd Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Doctrine/Repositories/SessionRepository.php
	lib/classes/User/Adapter.php
 2013-12-03 21:32:46 +01:00
Romain Neutron
e70e35ae04 Merge pull request #810 from romainneutron/fix-1594 
[3.8] Fix 1594 : Removed users are not disconnected
 2013-12-03 12:21:30 -08:00
Romain Neutron
766773da01 Fix CS 2013-12-03 21:20:19 +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
7904a33e07 Fix CS 2013-12-03 21:01:43 +01:00
Romain Neutron
1af21b88ef Fix CS 2013-12-03 20:59:47 +01:00
Romain Neutron
0575d6da44 Bump to version 3.9.0-alpha.9 2013-12-03 20:06:49 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
199134c25a Add cached translation loader 2013-12-03 20:05:21 +01:00
Romain Neutron
a057f0cc06 Use xliff instead of po files 2013-12-03 20:05:21 +01:00
Romain Neutron
a634fb1fb9 Fix translation dumper 2013-12-03 20:05:20 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
4de4f682f7 Move locales to resources folder 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
71df6e96a3 Remove old tests 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
0a813a6440 Bump to version 3.8.3-alpha.1 2013-12-03 18:22:15 +01:00
Romain Neutron
b024492c07 Merge pull request #819 from romainneutron/fix-1591 
Fix #1591 : Fix subdef group/name parameter extraction
 2013-12-03 09:09:19 -08:00