hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,700 Commits 268 Branches 107 Tags
7f97445b51f32446cb8befe01db66df6aac635c7
Commit Graph

2444 Commits

Author SHA1 Message Date
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
f0486f9478 Fix #1646 : Unable to mount collections 2014-01-13 18:06:18 +01:00
Romain Neutron
799e3620a3 Merge branch '3.8' 
Conflicts:
	lib/classes/API/V1/adapter.php
 2014-01-07 17:37:06 +01:00
Romain Neutron
d7b4e61c10 Make search engine a real service 2014-01-07 16:45:58 +01:00
Romain Neutron
7e77965be9 Fix #1647 : Cleanup SE cache after API query 2014-01-07 10:22:53 +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
Romain Neutron
0858586ceb Add subdef generator service 2013-12-26 17:00:16 +01:00
Romain Neutron
53ba5f215c Reduce memory usage 2013-12-26 15:34:05 +01:00
Romain Neutron
bb9eff5935 Merge pull request #792 from romainneutron/configuration 
[3.9] Move registry to configuration
 2013-12-20 08:44:10 -08:00
Romain Neutron
d147d4e39d Merge branch '3.8' 2013-12-20 16:46:35 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Nicolas Le Goff
ba21ed5d9f Fix #1637 Pagination is not working in report 2013-12-20 14:30:47 +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
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
573b51451a Merge pull request #855 from romainneutron/remove-sselnew 
[3.8] Remove table sselnew
 2013-12-20 00:42:09 -08:00
Romain Neutron
2804aeaf8e Fix 1634 : Template application bypass status bit restrictions 2013-12-19 20:28:24 +01:00
Romain Neutron
810b0e693f Remove table sselnew 2013-12-19 20:15:09 +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
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
d65a6bbb80 Fix autoregister 2013-12-18 23:35:42 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
a74ad06ad1 Fix CS 2013-12-18 18:15:16 +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
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
a165907b95 Fix #1627 : FTP receiver does not get its email 2013-12-18 10:47:16 +01: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
Nicolas Le Goff
7b0da9690c Fix #1619 Upgrade migration, checks if sbas exists before getting connection 2013-12-17 14:39:35 +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
d051fc7e65 Merge pull request #839 from romainneutron/fix-1621 
Fix #1621 : User query per last applied template triggers an error
 2013-12-11 14:48:21 -08:00
Romain Neutron
5642c144ee Merge pull request #837 from romainneutron/fix-1618 
[3.8] Fix user settings precedence
 2013-12-11 14:47:51 -08:00
Jean-Yves Gaulier
f71fb36377 fix #1612 
Conflicts:
	lib/classes/caption/Field/Value.php
 2013-12-11 19:49:49 +01:00
Jean-Yves Gaulier
f5f17549ad fix #1612 
Conflicts:
	lib/classes/caption/Field/Value.php
 2013-12-11 19:49:05 +01:00
Romain Neutron
7eb945f771 Fix #1621 : User query per last applied template triggers an error 2013-12-10 18:56:54 +01:00
Romain Neutron
2cb9dda244 Fix #1605 : Add advanced search reset on production load. 2013-12-10 11:48:17 +01:00
Romain Neutron
8fd1256aa2 Fix user settings precedence 2013-12-10 11:01:30 +01:00
Romain Neutron
804caccc73 Fix latest merge 2013-12-10 01:28:32 +01:00
Romain Neutron
1e3b3a1b60 Fix latest merges 2013-12-09 19:19:53 +01:00
Romain Neutron
c960ec7b34 Merge branch '3.8' 2013-12-09 19:13:15 +01:00
Romain Neutron
0804d01b4f Fix ACL binary comparison 2013-12-09 18:39:51 +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