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,325 Commits 268 Branches 107 Tags
12f9575a8b93a5f86dd89c42a22ff33c82fbe2c8
Commit Graph

2396 Commits

Author SHA1 Message Date
Nicolas Le Goff
18708c46b2 Fix #1667 Admin tree is not reloaded when empty action is triggered 2014-01-22 12:06:17 +01:00
Nicolas Le Goff
8378b53ee5 Add gettext extension as system requirement 2014-01-21 12:08:19 +01:00
Nicolas Le Goff
f58a1ee544 Merge pull request #873 from nlegoff/fix-usr-field-encoding 
[3.8] Fix usr.usr_login field encoding
 2014-01-20 01:51:23 -08:00
Romain Neutron
91cf9705ab Add subdef substituer 2014-01-14 15:05:44 +01:00
Nicolas Le Goff
b4d5cfbf52 Merge pull request #874 from romainneutron/fix-cs 
Fix CS
 2014-01-14 05:58:58 -08:00
Nicolas Le Goff
e91993bfd7 Bump 3.8.3alpha.4 version 2014-01-14 13:02:25 +01:00
Nicolas Le Goff
45679d8675 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/classes/collection.php
	templates/web/admin/databox/databox.html.twig
 2014-01-14 12:38:58 +01:00
Romain Neutron
2da822f65d Fix copyright year 2014-01-14 12:05:34 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Nicolas Le Goff
d5222ee72c Merge pull request #871 from romainneutron/fix-1646 
[3.8] Fix #1646 : Unable to mount collections
 2014-01-14 03:04:20 -08:00
Romain Neutron
0778c5852b Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
 2014-01-14 11:51:32 +01:00
Nicolas Le Goff
306890a12f Merge pull request #861 from romainneutron/sessions 
[3.9] Session management is now part of Phraseanet configuration
 2014-01-13 09:36:36 -08:00
Romain Neutron
f0486f9478 Fix #1646 : Unable to mount collections 2014-01-13 18:06:18 +01:00
Romain Neutron
d5f93e52fb Session management is now part of Phraseanet configuration 2014-01-13 17:44:47 +01:00
Romain Neutron
a1d117f1e5 Fix #1655 : Basket caption can be displayed through search engine 2014-01-13 13:20:44 +01:00
Romain Neutron
d7b4e61c10 Make search engine a real service 2014-01-07 16:45:58 +01:00
Romain Neutron
c6059c4a00 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/CLI.php
 2014-01-07 10:40:47 +01:00
Romain Neutron
947b746ca1 Minor tweaks on CLI application 2014-01-06 16:04:07 +01:00
Romain Neutron
09596e1451 Boot CLI application before run 2014-01-06 16:04:07 +01:00
Romain Neutron
354232f61a Bump copyright year 2014-01-06 15:40:56 +01:00
Romain Neutron
e233e5afa6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.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/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/ImageInterface.php
	lib/classes/http/request.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/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/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
 2014-01-06 15:38:14 +01:00
Romain Neutron
d519c13e56 Bump copyright year 2014-01-06 15:28:12 +01:00
Nicolas Le Goff
eb967d8b64 Merge pull request #863 from romainneutron/purge 
[3.9] Reduce memory usage
 2013-12-26 08:06:42 -08:00
Nicolas Le Goff
302b1c775c Merge pull request #860 from romainneutron/subdef-service 
[3.9] Add subdef generator service
 2013-12-26 08:02:05 -08:00
Romain Neutron
0858586ceb Add subdef generator service 2013-12-26 17:00:16 +01:00
Nicolas Le Goff
f95254c773 Merge branch '3.8' 2013-12-26 16:40:48 +01:00
Romain Neutron
53ba5f215c Reduce memory usage 2013-12-26 15:34:05 +01:00
Romain Neutron
1910da4e97 Fix #1640 : Only add search engine subscriber when the app is setup 2013-12-23 11:23:01 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
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
05b360ed0f Fix array declaration 2013-12-20 10:43:04 +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