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

2435 Commits

Author SHA1 Message Date
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
Romain Neutron
9197805eae Merge pull request #816 from romainneutron/fix-736 
[3.8] Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine
 2013-12-03 08:59:34 -08: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
fd83ba07cb Fix #1591 : Fix subdef group/name parameter extraction 2013-12-02 17:47:50 +01:00
Nicolas Le Goff
af94345f6c Update User entity 2013-11-28 18:00:05 +01:00
Romain Neutron
1472f96e93 Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine 2013-11-28 16:16:18 +01:00
Romain Neutron
e7eb81dd0c Merge pull request #814 from romainneutron/fix-1595 
[3.8] Fix #1595 : Export document with its title returns a document named with its filename
 2013-11-28 05:06:39 -08:00
Romain Neutron
d1973bdc06 Fix #1595 : Export document with its title returns a document named with its filename 2013-11-28 11:56:40 +01:00
Romain Neutron
94d547d897 Fix #1593 : "download" query parameter is not working anymore on permalink URIs 2013-11-28 11:49:19 +01:00
Nicolas Le Goff
0e69cd1bd4 Add DisplaySetting service 2013-11-27 12:01:25 +01:00
Romain Neutron
79dfa946d9 Add UrlGenerator trait 2013-11-22 09:32:21 +01:00
Romain Neutron
ddaca15070 Merge pull request #799 from romainneutron/code-comments 
[3.9] Remove commented code
 2013-11-20 10:05:22 -08:00
Romain Neutron
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +01:00
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
cae61dfe1e Remove commented code 2013-11-20 16:04:20 +01:00
Romain Neutron
3b7e0c9a30 Bump to version 3.8.3-alpha.0 2013-11-20 15:51:13 +01:00
Romain Neutron
10b28bc2ed Fix #1568 : Scheduler timeouts 2013-11-20 12:48:18 +01:00
Romain Neutron
3cec6617bf Update doctrine proxies 2013-11-20 12:34:33 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
94be7c5498 Add configuration property access service 2013-11-18 18:48:24 +01:00
Romain Neutron
a0a2fc8d41 Fix CS 2013-11-18 17:09:21 +01:00
Nicolas Le Goff
5b955b2a22 Fix neutron's comments 2013-11-18 16:22:28 +01:00
Nicolas Le Goff
98fee5038b Use short array syntax 2013-11-18 14:40:20 +01:00
Nicolas Le Goff
1cde667730 Remove PreSchema Upgrader 2013-11-18 14:37:25 +01:00
Nicolas Le Goff
4c58b141ee Fix neutron comments 2013-11-18 14:37:16 +01:00
Nicolas Le Goff
d8ea06b521 Fix migration 2013-11-18 14:36:45 +01:00
Nicolas Le Goff
99d4895f57 Add DoctrineMigration Patch 2013-11-18 14:35:38 +01:00
Nicolas Le Goff
dec0ae91c9 Add DoctrineMigrationProvider 2013-11-18 14:33:43 +01:00
Romain Neutron
d776462f46 Merge pull request #790 from romainneutron/property-access 
[3.9] Add configuration property access
 2013-11-18 05:32:25 -08:00
Romain Neutron
053b23a936 Update compiler to use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
2898b317c4 Drop PHP 5.3 support 2013-11-18 13:08:30 +01:00