hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,854 Commits 268 Branches 107 Tags
051d9f4035ddd03da583f6a4d0747da2bc11da50
Commit Graph

55 Commits

Author SHA1 Message Date
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +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
de05dcd113 Remove deprecated comments in prod controllers 2013-10-30 18:52:41 +01:00
Romain Neutron
1af022b84f Declare prod controllers as services, remove "call" methods 2013-10-30 18:47:40 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Nicolas Le Goff
75d767333c Move engine query log process from search engine classes to controllers 2013-08-25 13:55:04 +02:00
Romain Neutron
0ee6e87c2a Fix search engine suggestions usage 2013-08-08 11:05:47 +02:00
Romain Neutron
76413165ff Update authentication to service provider 2013-05-29 14:22:51 +02:00
Romain Neutron
c172ba7bbc Merge branch '3.7' 2013-03-28 14:37:57 +01:00
Romain Neutron
a193b8c473 Fix #1119 : Twitter and Facebook shares are available even if the system setting has been disabled 2013-03-25 15:12:05 +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
dda733e5a1 Add SearchEngineLogger tests, fix unit tests 2013-01-17 15:33:58 +01:00
Romain Neutron
07b3216a26 Add SearchEngineOptions tests, move SearchEngineRequest methods to SearchEngineOptions as a factory 2013-01-17 14:13:47 +01:00
Romain Neutron
8a0c3c0bbc [SearchEngine] Fix CS 2013-01-17 12:03:19 +01:00
Romain Neutron
f8997a034c [SearchEngine] Add SearchEngineLogger, log queries 2013-01-17 12:03:19 +01:00
Romain Neutron
858d0fda35 [SearchEngine] Add SearchRequest object 2013-01-17 12:03:19 +01:00
Romain Neutron
18ba7f40aa [SearchEngine] Fix build, add tests 2013-01-17 11:44:47 +01:00
Romain Neutron
360d7a91fb [SearchEngine] Fix merge 2013-01-17 11:44:47 +01:00
Romain Neutron
85155262c9 [SearchEngine] Propagate search engine modifications 2013-01-17 11:43:36 +01:00
Romain Neutron
f0fed8bb7e Merge with 3.7 2012-10-30 11:27:50 +01:00
Romain Neutron
39e1eb9945 Fix #970 : fix default sort mode 2012-10-29 18:36:45 +01:00
Nicolas Le Goff
11b521de8b Refactor record detailed view controller 
Fix typo

Fix Typo
 2012-10-26 12:18:24 +02:00
Nicolas Le Goff
12fe0c2283 Remove duplicated routes 
Fix Cs

FixCS
 2012-10-19 17:32:05 +02:00
Nicolas Le Goff
cb1395900e Fix query tests 2012-10-18 15:45:54 +02:00
Nicolas Le Goff
f047c83c17 Fix PR 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
45c3e564df Fix PR 
Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	templates/web/prod/Share/record.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
c40804287a Update refactor 
Fix indent

Conflicts:

	lib/Alchemy/Phrasea/Application/Root.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
19f1bca120 Fix CS 
Add comments

Remove bad ident

Undo modification

Conflicts:

	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Nicolas Le Goff
cde9ce18ae Add prod refactor 
Fix issue

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/User/Notifications.php
	lib/Alchemy/Phrasea/Controller/User/Preferences.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Romain Neutron
13b67dfe37 Update Firewall API 2012-10-04 15:44:53 +02:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
1700565862 Cleanup namepaces, variables uses 2012-10-04 15:44:49 +02:00
Romain Neutron
58af2b4c9c Remove get_registry method 2012-10-04 15:44:49 +02:00
Romain Neutron
f68cae2bb4 Cleanup controllers 2012-10-04 15:44:48 +02:00
Romain Neutron
abc4d81521 Update controllers 2012-10-04 15:42:54 +02:00
Romain Neutron
2c7a3be278 Update controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
1fc9a78e7f Update prod controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
0f7056dfed Normalize request calls 2012-08-23 14:15:21 +02:00
Romain Neutron
9f11445265 Namespaces cleanup 2012-07-27 12:26:12 +02:00
Romain Neutron
89737fb5e4 Remove serializer 2012-07-24 19:01:06 +02:00
Romain Neutron
4dcb9b8be1 Update templates filepaths 2012-07-24 13:12:24 +02:00
Romain Neutron
2a4a3f3ec8 Enable Twig service provider 2012-07-24 13:11:26 +02:00
Romain Neutron
3812399a35 Add Phraseanet Service Provider and Phraseanet Application 2012-07-18 18:07:34 +02:00
Romain Neutron
4c7463cf29 Update to the latest silex API 2012-06-19 18:39:33 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00
Ysolyne Gresille
76260364aa Updtae bootstrap / skins 2012-05-21 14:27:52 +02:00