hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,778 Commits 268 Branches 107 Tags
d7a68dbec36d2b90a0ff42b42c73df5aec8889f1
Commit Graph

38 Commits

Author SHA1 Message Date
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
a2899f6934 Insight recommendations 2013-11-12 17:58:03 +01:00
Romain Neutron
ea7523f1db Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/record/adapter.php
	lib/classes/task/Scheduler.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 14:01:44 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
219156bf8e Add SearchEngineInterface::isStemmingEnabled 2013-09-17 17:03:41 +02:00
Andrey
d8d9ab7607 Removed remaining occurrences to Feed_, adapted patch_320f 2013-09-05 13:44:05 +02:00
Romain Neutron
5b0e5ccddc SphinxSearch engine default values uniformisation 2013-08-08 11:05:47 +02:00
Romain Neutron
4e9953d0d2 Fix #1269 : Save search engine options in phraseanet configuration instead of json file 2013-07-10 19:45:54 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
f2098fc42b Improve unit tests 2013-02-02 20:31:34 +01:00
Romain Neutron
074352fa51 Add support and realtime index for german and dutch stemmatization in SphinxSearchEngine 2013-02-01 18:52:41 +01:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
8a0c3c0bbc [SearchEngine] Fix CS 2013-01-17 12:03:19 +01:00
Romain Neutron
6e7bb37e7e [SearchEngine] Move SearchEngineInetrface::status to SearchEngineInterface::getStatus 2013-01-17 12:03:19 +01:00
Romain Neutron
4d6608b9d1 [SearchEngine] Update API monitor 2013-01-17 12:03:19 +01:00
Romain Neutron
5be95d55fc [SearchEngine] Add code documentation 2013-01-17 12:02:44 +01:00
Romain Neutron
685d02d94e [SearchEngine] Add SearchEngineResult unit tests 2013-01-17 12:02:44 +01:00
Romain Neutron
c5e9b1f7b5 [SearchEngine] Add support for queries by date 2013-01-17 12:01:41 +01:00
Romain Neutron
cf01631da7 [SearchEngine] Fix build on 32bit systems 2013-01-17 12:01:41 +01:00
Romain Neutron
999eafe20a [SearchEngine] Remove sphinxapi.php require 2013-01-17 12:01:40 +01:00
Romain Neutron
3a6c288d91 [SearchEngine] Add exception where real time index is not available 2013-01-17 12:00:48 +01:00
Romain Neutron
da142f80e9 [SearchEngine] Finalize search engine refactor 2013-01-17 11:59:47 +01:00
Romain Neutron
bb2b529805 [SearchEngine] Add unit tests 2013-01-17 11:57:47 +01:00
Romain Neutron
0ec2117b60 [SearchEngine] Update PR to latest master 2013-01-17 11:57:24 +01:00
Romain Neutron
18289296a0 [SearchEngine] Add unit tests 2013-01-17 11:54:38 +01:00
Romain Neutron
1f3b6fa54f [SearchEngine] Add unit tests 2013-01-17 11:51:47 +01:00
Romain Neutron
a104cd879f [SearchEngine] Rename directories 2013-01-17 11:50:05 +01:00
Romain Neutron
100d3d2cd7 [SearchEngine] Remove sphinxapi.php require 2013-01-17 11:44:47 +01:00
Romain Neutron
8d7048716e [SearchEngine] Add exception where real time index is not available 2013-01-17 11:43:37 +01:00
Romain Neutron
133595635c [SearchEngine] Finalize search engine refactor 2013-01-17 11:43:36 +01:00
Romain Neutron
eb641fc920 [SearchEngine] Add unit tests 2013-01-17 11:43:36 +01:00
romain
c1d952a17e [SearchEngine] Update PR to latest master 2013-01-17 11:43:35 +01:00
Romain Neutron
2756511cbf [SearchEngine] Add unit tests 2013-01-17 11:43:34 +01:00
Romain Neutron
b284cb2661 [SearchEngine] Add unit tests 2013-01-17 11:43:34 +01:00
Romain Neutron
697cab9dce [SearchEngine] Rename directories 2013-01-17 11:43:33 +01:00